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 fff41d6b52..0a664de6ce 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -818,7 +818,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2659146243 +#define SIGNATURE_HASH 2240263064 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1115,14 +1115,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.06.cypress.2659146243" +#define TS_SIGNATURE "rusEFI master.2023.12.06.cypress.2240263064" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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 a750601f62..41432d8e8d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -818,7 +818,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3702431149 +#define SIGNATURE_HASH 3344331830 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1115,14 +1115,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.06.kin.3702431149" +#define TS_SIGNATURE "rusEFI master.2023.12.06.kin.3344331830" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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 e22bdd6ffd..d26f68156d 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 @@ -1056,7 +1056,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2582813972 +#define SIGNATURE_HASH 2181723279 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1353,14 +1353,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.06.subaru_eg33_f7.2582813972" +#define TS_SIGNATURE "rusEFI master.2023.12.06.subaru_eg33_f7.2181723279" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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 8cff2d0ed3..aa22a498fa 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -564,8 +564,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index d888724939..460021819c 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -319,7 +319,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -327,6 +326,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index a6d8ef6724..504dbed2e8 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -49,11 +49,11 @@ LDS_lambda_monitor, #define TRIGGER_CENTRAL_BASE_ADDRESS 1184 #define TRIGGER_STATE_BASE_ADDRESS 1244 #define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1284 -#define WALL_FUEL_STATE_BASE_ADDRESS 1288 -#define IDLE_STATE_BASE_ADDRESS 1296 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1344 -#define WIDEBAND_STATE_BASE_ADDRESS 1396 -#define DC_MOTORS_BASE_ADDRESS 1408 -#define SENT_STATE_BASE_ADDRESS 1420 -#define VVT_BASE_ADDRESS 1428 -#define LAMBDA_MONITOR_BASE_ADDRESS 1432 +#define WALL_FUEL_STATE_BASE_ADDRESS 1292 +#define IDLE_STATE_BASE_ADDRESS 1300 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1348 +#define WIDEBAND_STATE_BASE_ADDRESS 1400 +#define DC_MOTORS_BASE_ADDRESS 1412 +#define SENT_STATE_BASE_ADDRESS 1424 +#define VVT_BASE_ADDRESS 1432 +#define LAMBDA_MONITOR_BASE_ADDRESS 1436 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index bd73d1489c..e4a87526a3 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -702,79 +702,79 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 736c7083b2..f5f57fe762 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -509,53 +509,54 @@ vvtToothPosition3("vvtToothPosition 3", SensorCategory.SENSOR_INPUTS, FieldType. vvtToothPosition4("vvtToothPosition 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1272, 1.0, -10000.0, 10000.0, "sync: Cam Tooth Position"), triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1276, 1.0, -10000.0, 10000.0, ""), triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1280, 1.0, -1.0, -1.0, ""), -camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1281, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1282, 1.0, -1.0, -1.0, ""), -alignmentFill_at_39("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1283, 1.0, -20.0, 100.0, "units"), -wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1288, 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, 1292, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), -currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, 0.0, 0.0, "%"), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, -1.0, -1.0, ""), -idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 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, 1316, 1.0, -1.0, -1.0, ""), -idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -1.0, -1.0, ""), -targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), -targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, 0.0, 10.0, "per"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, 0.0, 3.0, "per"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, 0.0, 3.0, "per"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1364, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1368, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1372, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1380, 1.0, 0.0, 25.0, "per"), -etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, -20.0, 50.0, "per"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1388, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1390, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1392, 1.0, -1.0, -1.0, ""), -alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1393, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1394, 0.01, 0.0, 100.0, "sec"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1396, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1397, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1398, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1399, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1400, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1402, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1404, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1406, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1408, 1.0, 0.0, 10.0, "per"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1412, 1.0, 0.0, 10.0, "per"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1413, 1.0, -20.0, 100.0, "units"), -value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1420, 1.0, 0.0, 3.0, "value"), -value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1422, 1.0, 0.0, 3.0, "value"), -errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1424, 1.0, 0.0, 3.0, "ratio"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1428, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1430, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1431, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1436, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1438, 1.0, -20.0, 100.0, "units"), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1281, 1.0, -1.0, -1.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1282, 1.0, -20.0, 100.0, "units"), +camResyncCounter("sync: Phase Re-Sync Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1284, 1.0, -1.0, -1.0, ""), +alignmentFill_at_1("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1285, 1.0, -20.0, 100.0, "units"), +wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 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, 1296, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), +currentIdlePosition("Idle: Position", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, 0.0, 0.0, "%"), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), +idleClosedLoop("Idle: Closed loop", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 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, 1320, 1.0, -1.0, -1.0, ""), +idleTarget("Idle: Target RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -1.0, -1.0, ""), +targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -1.0, -1.0, ""), +targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -1.0, -1.0, ""), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1348, 1.0, 0.0, 10.0, "per"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1352, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1356, 1.0, 0.0, 3.0, "per"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, 0.0, 3.0, "per"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1364, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1368, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1372, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1376, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, 0.0, 25.0, "per"), +etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1388, 1.0, -20.0, 50.0, "per"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1392, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1394, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1396, 1.0, -1.0, -1.0, ""), +alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1397, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1398, 0.01, 0.0, 100.0, "sec"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1400, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1401, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1402, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1403, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1404, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1406, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1408, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1410, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1412, 1.0, 0.0, 10.0, "per"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1416, 1.0, 0.0, 10.0, "per"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1417, 1.0, -20.0, 100.0, "units"), +value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1424, 1.0, 0.0, 3.0, "value"), +value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1426, 1.0, 0.0, 3.0, "value"), +errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1428, 1.0, 0.0, 3.0, "ratio"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1432, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1434, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1435, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1440, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1442, 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 8b2b1e7b81..175a646759 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 1440 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1444 \ No newline at end of file diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 77281331a3..c0e983a302 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1144,7 +1144,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 415350928 +#define SIGNATURE_HASH 54077707 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1441,14 +1441,14 @@ #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true -#define TS_SIGNATURE "rusEFI master.2023.12.06.f407-discovery.415350928" +#define TS_SIGNATURE "rusEFI master.2023.12.06.f407-discovery.54077707" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1440 +#define TS_TOTAL_OUTPUT_SIZE 1444 #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_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 9b73341719..eddd9c42c7 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 3993693700 -#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-2chan.3993693700" +#define SIGNATURE_HASH 4126279583 +#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-2chan.4126279583" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 3235750a1d..29f06464da 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 1181209810 -#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-4chan.1181209810" +#define SIGNATURE_HASH 1570717001 +#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-4chan.1570717001" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 6105912277..4ee9f91e56 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 1181209810 -#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-4chan_f7.1181209810" +#define SIGNATURE_HASH 1570717001 +#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-4chan_f7.1570717001" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 7ec100c216..df8d7a98ef 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2945221632 -#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-8chan-revA.2945221632" +#define SIGNATURE_HASH 3027529115 +#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-8chan-revA.3027529115" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 63b93576e7..a3116d5378 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 1881715107 -#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-8chan.1881715107" +#define SIGNATURE_HASH 1808816184 +#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-8chan.1808816184" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 0b9041906a..89b48e3d32 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 1881715107 -#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-8chan_f7.1881715107" +#define SIGNATURE_HASH 1808816184 +#define TS_SIGNATURE "rusEFI master.2023.12.06.alphax-8chan_f7.1808816184" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 33421f5695..a502f2a06a 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.at_start_f435.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.at_start_f435.2240263064" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 784a73d63f..99efb3d088 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 3665333837 -#define TS_SIGNATURE "rusEFI master.2023.12.06.atlas.3665333837" +#define SIGNATURE_HASH 3246417878 +#define TS_SIGNATURE "rusEFI master.2023.12.06.atlas.3246417878" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 05a0314a52..2744e0eb79 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 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.cypress.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.cypress.2240263064" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 0af27d09eb..da10cdcb12 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 415350928 -#define TS_SIGNATURE "rusEFI master.2023.12.06.f407-discovery.415350928" +#define SIGNATURE_HASH 54077707 +#define TS_SIGNATURE "rusEFI master.2023.12.06.f407-discovery.54077707" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index c3a6e885ce..fe6ef45665 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 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.f429-discovery.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.f429-discovery.2240263064" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index dd4b57bccd..45c3084a86 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 3157113545 -#define TS_SIGNATURE "rusEFI master.2023.12.06.frankenso_na6.3157113545" +#define SIGNATURE_HASH 2815775570 +#define TS_SIGNATURE "rusEFI master.2023.12.06.frankenso_na6.2815775570" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 8f8ec5b792..4bebf3ded9 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4176219951 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-112-17.4176219951" +#define SIGNATURE_HASH 3809797812 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-112-17.3809797812" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 4616e52b15..4a166d76d9 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 781053171 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-gm-e67.781053171" +#define SIGNATURE_HASH 896861544 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-gm-e67.896861544" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 4e095a951d..b7594b9c04 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 1201628192 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-honda-k.1201628192" +#define SIGNATURE_HASH 1550290363 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-honda-k.1550290363" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 259b80d9d6..9d75d8d840 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 4055717652 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-nb1.4055717652" +#define SIGNATURE_HASH 3930439311 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen-nb1.3930439311" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 4d49a94160..60c8e11d9f 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 122272823 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen121nissan.122272823" +#define SIGNATURE_HASH 481383852 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen121nissan.481383852" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 4b1fa30fa2..db8627a3c7 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 167855552 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen121vag.167855552" +#define SIGNATURE_HASH 301575259 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen121vag.301575259" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 0ba36a0ed7..b8e75aeb4d 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 1370348905 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen128.1370348905" +#define SIGNATURE_HASH 1247098098 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen128.1247098098" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 510e902028..66e20bb263 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 4182152197 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen154hyundai.4182152197" +#define SIGNATURE_HASH 3804134814 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen154hyundai.3804134814" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 21e8e6aeb2..e30e3c34c4 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 4063976494 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen72.4063976494" +#define SIGNATURE_HASH 3921917365 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen72.3921917365" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a8f2caac02..2393f57392 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 1127000172 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen81.1127000172" +#define SIGNATURE_HASH 1490305527 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen81.1490305527" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 9aa435ace9..00372b824c 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 1885001671 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen88bmw.1885001671" +#define SIGNATURE_HASH 1805794908 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellen88bmw.1805794908" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index c3b3fdf467..d624bce5c0 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 1970456103 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellenNA6.1970456103" +#define SIGNATURE_HASH 1854549948 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellenNA6.1854549948" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 28d1b3c416..579b54c38f 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 332650216 -#define TS_SIGNATURE "rusEFI master.2023.12.06.hellenNA8_96.332650216" +#define SIGNATURE_HASH 137052019 +#define TS_SIGNATURE "rusEFI master.2023.12.06.hellenNA8_96.137052019" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index fefecbe9d1..7a6610e073 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 3702431149 -#define TS_SIGNATURE "rusEFI master.2023.12.06.kin.3702431149" +#define SIGNATURE_HASH 3344331830 +#define TS_SIGNATURE "rusEFI master.2023.12.06.kin.3344331830" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index c655a813f9..1dd055f712 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 112291754 -#define TS_SIGNATURE "rusEFI master.2023.12.06.m74_9.112291754" +#define SIGNATURE_HASH 491357745 +#define TS_SIGNATURE "rusEFI master.2023.12.06.m74_9.491357745" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 80e663003a..2725698bd4 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 3172119427 -#define TS_SIGNATURE "rusEFI master.2023.12.06.mre_f4.3172119427" +#define SIGNATURE_HASH 2800376344 +#define TS_SIGNATURE "rusEFI master.2023.12.06.mre_f4.2800376344" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5f404a4848..e173f12cd2 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 3172119427 -#define TS_SIGNATURE "rusEFI master.2023.12.06.mre_f7.3172119427" +#define SIGNATURE_HASH 2800376344 +#define TS_SIGNATURE "rusEFI master.2023.12.06.mre_f7.2800376344" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index f3ffaadddb..6c1f438b1f 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 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.nucleo_f429.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.nucleo_f429.2240263064" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index ba25a783b6..13bcccc259 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 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.nucleo_f767.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.nucleo_f767.2240263064" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 447aa8b0cc..69ca7d3bce 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 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.nucleo_h743.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.nucleo_h743.2240263064" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e07e983b8c..8e87fd7ca6 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 2934675347 -#define TS_SIGNATURE "rusEFI master.2023.12.06.prometheus_405.2934675347" +#define SIGNATURE_HASH 3037953544 +#define TS_SIGNATURE "rusEFI master.2023.12.06.prometheus_405.3037953544" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index e0ff0f3050..e9c9563f87 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 2934675347 -#define TS_SIGNATURE "rusEFI master.2023.12.06.prometheus_469.2934675347" +#define SIGNATURE_HASH 3037953544 +#define TS_SIGNATURE "rusEFI master.2023.12.06.prometheus_469.3037953544" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5423f9a976..2149a26694 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 2657920121 -#define TS_SIGNATURE "rusEFI master.2023.12.06.proteus_f4.2657920121" +#define SIGNATURE_HASH 2241088994 +#define TS_SIGNATURE "rusEFI master.2023.12.06.proteus_f4.2241088994" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 59edce3756..0f38b35eb4 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 2657920121 -#define TS_SIGNATURE "rusEFI master.2023.12.06.proteus_f7.2657920121" +#define SIGNATURE_HASH 2241088994 +#define TS_SIGNATURE "rusEFI master.2023.12.06.proteus_f7.2241088994" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index bfd9cb8cd2..93be978d97 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 2657920121 -#define TS_SIGNATURE "rusEFI master.2023.12.06.proteus_h7.2657920121" +#define SIGNATURE_HASH 2241088994 +#define TS_SIGNATURE "rusEFI master.2023.12.06.proteus_h7.2241088994" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index a2bbd0eec1..4a5d2b96a6 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 4048861797 -#define TS_SIGNATURE "rusEFI master.2023.12.06.s105.4048861797" +#define SIGNATURE_HASH 3937162238 +#define TS_SIGNATURE "rusEFI master.2023.12.06.s105.3937162238" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 1cc46c4949..8a5483ce27 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2481939983 -#define TS_SIGNATURE "rusEFI master.2023.12.06.small-can-board.2481939983" +#define SIGNATURE_HASH 2283245460 +#define TS_SIGNATURE "rusEFI master.2023.12.06.small-can-board.2283245460" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 60ba3b42eb..c8fcf17cc7 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 2582813972 -#define TS_SIGNATURE "rusEFI master.2023.12.06.subaru_eg33_f7.2582813972" +#define SIGNATURE_HASH 2181723279 +#define TS_SIGNATURE "rusEFI master.2023.12.06.subaru_eg33_f7.2181723279" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 987ba8c1f0..a154c28fc0 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 2659146243 -#define TS_SIGNATURE "rusEFI master.2023.12.06.t-b-g.2659146243" +#define SIGNATURE_HASH 2240263064 +#define TS_SIGNATURE "rusEFI master.2023.12.06.t-b-g.2240263064" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 2f00ac46c7..28e3792322 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 349271585 -#define TS_SIGNATURE "rusEFI master.2023.12.06.tdg-pdm8.349271585" +#define SIGNATURE_HASH 254386106 +#define TS_SIGNATURE "rusEFI master.2023.12.06.tdg-pdm8.254386106" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 79d3c8e632..d2ccfc791b 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 916670389 -#define TS_SIGNATURE "rusEFI master.2023.12.06.uaefi.916670389" +#define SIGNATURE_HASH 760983086 +#define TS_SIGNATURE "rusEFI master.2023.12.06.uaefi.760983086" diff --git a/firmware/controllers/trigger/trigger_state_generated.h b/firmware/controllers/trigger/trigger_state_generated.h index ad54154b98..6bbd65e899 100644 --- a/firmware/controllers/trigger/trigger_state_generated.h +++ b/firmware/controllers/trigger/trigger_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Fri Oct 06 17:24:04 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -40,22 +40,17 @@ struct trigger_state_s { */ uint8_t triggerStateIndex = (uint8_t)0; /** - * sync: Phase Re-Sync Counter * offset 37 */ - uint8_t camResyncCounter = (uint8_t)0; - /** - * offset 38 - */ uint8_t vvtStateIndex = (uint8_t)0; /** * need 4 byte alignment units - * offset 39 + * offset 38 */ - uint8_t alignmentFill_at_39[1]; + uint8_t alignmentFill_at_38[2]; }; static_assert(sizeof(trigger_state_s) == 40); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Fri Oct 06 17:24:04 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Dec 06 19:47:30 UTC 2023 diff --git a/firmware/controllers/trigger/trigger_state_primary_generated.h b/firmware/controllers/trigger/trigger_state_primary_generated.h index 63c212589b..ab6569bf32 100644 --- a/firmware/controllers/trigger/trigger_state_primary_generated.h +++ b/firmware/controllers/trigger/trigger_state_primary_generated.h @@ -1,109 +1,120 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sun Sep 10 01:01:29 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once #include "rusefi_types.h" // start of trigger_state_primary_s struct trigger_state_primary_s { + /** + * sync: Phase Re-Sync Counter + * offset 0 + */ + uint8_t camResyncCounter = (uint8_t)0; + /** + * need 4 byte alignment + units + * offset 1 + */ + uint8_t alignmentFill_at_1[3]; /** * sync: Known Engine Phase - offset 0 bit 0 */ + offset 4 bit 0 */ bool m_hasSynchronizedPhase : 1 {}; /** - offset 0 bit 1 */ - bool unusedBit_1_1 : 1 {}; + offset 4 bit 1 */ + bool unusedBit_3_1 : 1 {}; /** - offset 0 bit 2 */ - bool unusedBit_1_2 : 1 {}; + offset 4 bit 2 */ + bool unusedBit_3_2 : 1 {}; /** - offset 0 bit 3 */ - bool unusedBit_1_3 : 1 {}; + offset 4 bit 3 */ + bool unusedBit_3_3 : 1 {}; /** - offset 0 bit 4 */ - bool unusedBit_1_4 : 1 {}; + offset 4 bit 4 */ + bool unusedBit_3_4 : 1 {}; /** - offset 0 bit 5 */ - bool unusedBit_1_5 : 1 {}; + offset 4 bit 5 */ + bool unusedBit_3_5 : 1 {}; /** - offset 0 bit 6 */ - bool unusedBit_1_6 : 1 {}; + offset 4 bit 6 */ + bool unusedBit_3_6 : 1 {}; /** - offset 0 bit 7 */ - bool unusedBit_1_7 : 1 {}; + offset 4 bit 7 */ + bool unusedBit_3_7 : 1 {}; /** - offset 0 bit 8 */ - bool unusedBit_1_8 : 1 {}; + offset 4 bit 8 */ + bool unusedBit_3_8 : 1 {}; /** - offset 0 bit 9 */ - bool unusedBit_1_9 : 1 {}; + offset 4 bit 9 */ + bool unusedBit_3_9 : 1 {}; /** - offset 0 bit 10 */ - bool unusedBit_1_10 : 1 {}; + offset 4 bit 10 */ + bool unusedBit_3_10 : 1 {}; /** - offset 0 bit 11 */ - bool unusedBit_1_11 : 1 {}; + offset 4 bit 11 */ + bool unusedBit_3_11 : 1 {}; /** - offset 0 bit 12 */ - bool unusedBit_1_12 : 1 {}; + offset 4 bit 12 */ + bool unusedBit_3_12 : 1 {}; /** - offset 0 bit 13 */ - bool unusedBit_1_13 : 1 {}; + offset 4 bit 13 */ + bool unusedBit_3_13 : 1 {}; /** - offset 0 bit 14 */ - bool unusedBit_1_14 : 1 {}; + offset 4 bit 14 */ + bool unusedBit_3_14 : 1 {}; /** - offset 0 bit 15 */ - bool unusedBit_1_15 : 1 {}; + offset 4 bit 15 */ + bool unusedBit_3_15 : 1 {}; /** - offset 0 bit 16 */ - bool unusedBit_1_16 : 1 {}; + offset 4 bit 16 */ + bool unusedBit_3_16 : 1 {}; /** - offset 0 bit 17 */ - bool unusedBit_1_17 : 1 {}; + offset 4 bit 17 */ + bool unusedBit_3_17 : 1 {}; /** - offset 0 bit 18 */ - bool unusedBit_1_18 : 1 {}; + offset 4 bit 18 */ + bool unusedBit_3_18 : 1 {}; /** - offset 0 bit 19 */ - bool unusedBit_1_19 : 1 {}; + offset 4 bit 19 */ + bool unusedBit_3_19 : 1 {}; /** - offset 0 bit 20 */ - bool unusedBit_1_20 : 1 {}; + offset 4 bit 20 */ + bool unusedBit_3_20 : 1 {}; /** - offset 0 bit 21 */ - bool unusedBit_1_21 : 1 {}; + offset 4 bit 21 */ + bool unusedBit_3_21 : 1 {}; /** - offset 0 bit 22 */ - bool unusedBit_1_22 : 1 {}; + offset 4 bit 22 */ + bool unusedBit_3_22 : 1 {}; /** - offset 0 bit 23 */ - bool unusedBit_1_23 : 1 {}; + offset 4 bit 23 */ + bool unusedBit_3_23 : 1 {}; /** - offset 0 bit 24 */ - bool unusedBit_1_24 : 1 {}; + offset 4 bit 24 */ + bool unusedBit_3_24 : 1 {}; /** - offset 0 bit 25 */ - bool unusedBit_1_25 : 1 {}; + offset 4 bit 25 */ + bool unusedBit_3_25 : 1 {}; /** - offset 0 bit 26 */ - bool unusedBit_1_26 : 1 {}; + offset 4 bit 26 */ + bool unusedBit_3_26 : 1 {}; /** - offset 0 bit 27 */ - bool unusedBit_1_27 : 1 {}; + offset 4 bit 27 */ + bool unusedBit_3_27 : 1 {}; /** - offset 0 bit 28 */ - bool unusedBit_1_28 : 1 {}; + offset 4 bit 28 */ + bool unusedBit_3_28 : 1 {}; /** - offset 0 bit 29 */ - bool unusedBit_1_29 : 1 {}; + offset 4 bit 29 */ + bool unusedBit_3_29 : 1 {}; /** - offset 0 bit 30 */ - bool unusedBit_1_30 : 1 {}; + offset 4 bit 30 */ + bool unusedBit_3_30 : 1 {}; /** - offset 0 bit 31 */ - bool unusedBit_1_31 : 1 {}; + offset 4 bit 31 */ + bool unusedBit_3_31 : 1 {}; }; -static_assert(sizeof(trigger_state_primary_s) == 4); +static_assert(sizeof(trigger_state_primary_s) == 8); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sun Sep 10 01:01:29 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Dec 06 19:47:30 UTC 2023 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b9924fd1fa..f531251667 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.12.06.f407-discovery.415350928" + signature = "rusEFI master.2023.12.06.f407-discovery.54077707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.f407-discovery.415350928" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.f407-discovery.54077707" ; 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 Dec 06 14:22:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:29 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5284,8 +5284,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6203,7 +6203,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6211,6 +6210,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 1387e44a9b..a19ea73033 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.12.06.alphax-2chan.3993693700" + signature = "rusEFI master.2023.12.06.alphax-2chan.4126279583" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.alphax-2chan.3993693700" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.alphax-2chan.4126279583" ; 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","X7 - AIN4","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:20:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:44 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6198,7 +6198,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6206,6 +6205,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 2e8c4f8fa1..f9dfe7463d 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.12.06.alphax-4chan.1181209810" + signature = "rusEFI master.2023.12.06.alphax-4chan.1570717001" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.alphax-4chan.1181209810" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.alphax-4chan.1570717001" ; 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","X7 - AIN4","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:20:36 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:46 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index cc767fd3c3..eaa186969f 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.12.06.alphax-4chan_f7.1181209810" + signature = "rusEFI master.2023.12.06.alphax-4chan_f7.1570717001" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.alphax-4chan_f7.1181209810" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.alphax-4chan_f7.1570717001" ; 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","X7 - AIN4","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:20:39 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:49 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 14271ebbd8..49a50e633c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.06.alphax-8chan-revA.2945221632" + signature = "rusEFI master.2023.12.06.alphax-8chan-revA.3027529115" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.alphax-8chan-revA.2945221632" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.alphax-8chan-revA.3027529115" ; 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","31C - PPS2","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 Dec 06 14:20:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:58 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6202,7 +6202,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6210,6 +6209,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 55a4b6f7af..d6bcff2eb4 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.12.06.alphax-8chan.1881715107" + signature = "rusEFI master.2023.12.06.alphax-8chan.1808816184" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.alphax-8chan.1881715107" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.alphax-8chan.1808816184" ; 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","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:20:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:52 UTC 2023 pageSize = 23896 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23886, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3088,82 +3088,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5286,8 +5286,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6205,7 +6205,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6213,6 +6212,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 95fc4ebbdf..0ae1a79869 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.12.06.alphax-8chan_f7.1881715107" + signature = "rusEFI master.2023.12.06.alphax-8chan_f7.1808816184" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.alphax-8chan_f7.1881715107" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.alphax-8chan_f7.1808816184" ; 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","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:20:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:55 UTC 2023 pageSize = 23896 page = 1 @@ -2373,7 +2373,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23886, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3088,82 +3088,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5286,8 +5286,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6205,7 +6205,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6213,6 +6212,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 2cd6435536..b3e58eda5c 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.06.at_start_f435.2659146243" + signature = "rusEFI master.2023.12.06.at_start_f435.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.at_start_f435.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.at_start_f435.2240263064" ; 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 Dec 06 14:22:03 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:25 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 3f559a612c..11486dbf3d 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.12.06.atlas.3665333837" + signature = "rusEFI master.2023.12.06.atlas.3246417878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.atlas.3665333837" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.atlas.3246417878" ; 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 Dec 06 14:21:56 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:17 UTC 2023 pageSize = 23380 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23370, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index c7ffb2ebc6..6ef65aaf70 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.12.06.cypress.2659146243" + signature = "rusEFI master.2023.12.06.cypress.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.cypress.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.cypress.2240263064" ; 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 Dec 06 14:20:31 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:40 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index c507f2742a..fa6b5bf49a 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.12.06.f407-discovery.415350928" + signature = "rusEFI master.2023.12.06.f407-discovery.54077707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.f407-discovery.415350928" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.f407-discovery.54077707" ; 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 Dec 06 14:22:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:22 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5284,8 +5284,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6203,7 +6203,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6211,6 +6210,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index dfbe11a430..70e5420f50 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.12.06.f429-discovery.2659146243" + signature = "rusEFI master.2023.12.06.f429-discovery.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.f429-discovery.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.f429-discovery.2240263064" ; 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 Dec 06 14:21:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:07 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9822fa4073..2e5926448d 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.12.06.frankenso_na6.3157113545" + signature = "rusEFI master.2023.12.06.frankenso_na6.2815775570" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.frankenso_na6.3157113545" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.frankenso_na6.2815775570" ; 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 Dec 06 14:21:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:52 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 9061f2134f..e997a42c38 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.06.hellen-112-17.4176219951" + signature = "rusEFI master.2023.12.06.hellen-112-17.3809797812" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen-112-17.4176219951" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen-112-17.3809797812" ; 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","220 TPS Throttle Position 2","114 Analog Input","INVALID","121 PPS1","203 TPS Throttle Position 1","INVALID","107 TODO","119 Analog Input","110 Analog Input","INVALID","219 MAP","109 Analog Input","215 CLT","227 IAT","111 Analog Input","112 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 Dec 06 14:21:05 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:18 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6199,7 +6199,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6207,6 +6206,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 96dd9283f8..6331ca42e1 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.12.06.hellen-gm-e67.781053171" + signature = "rusEFI master.2023.12.06.hellen-gm-e67.896861544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen-gm-e67.781053171" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen-gm-e67.896861544" ; 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 Dec 06 14:21:14 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:29 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 16ee2f5d41..5552037d09 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.12.06.hellen-honda-k.1201628192" + signature = "rusEFI master.2023.12.06.hellen-honda-k.1550290363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen-honda-k.1201628192" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen-honda-k.1550290363" ; 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","Aux Analog 1","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT","Aux Analog 2","Aux Analog 3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:20:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:08 UTC 2023 pageSize = 24552 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 24542, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6199,7 +6199,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6207,6 +6206,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index eb791ca7e8..32ce23d21a 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.12.06.hellen-nb1.4055717652" + signature = "rusEFI master.2023.12.06.hellen-nb1.3930439311" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen-nb1.4055717652" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen-nb1.3930439311" ; 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 Dec 06 14:21:12 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:26 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index cc4d49cf93..f6f1d65100 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.12.06.hellen121nissan.122272823" + signature = "rusEFI master.2023.12.06.hellen121nissan.481383852" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen121nissan.122272823" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen121nissan.481383852" ; 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 Dec 06 14:20:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:05 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6199,7 +6199,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6207,6 +6206,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index b4ab4ed4d0..25aecbd8bd 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.12.06.hellen121vag.167855552" + signature = "rusEFI master.2023.12.06.hellen121vag.301575259" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen121vag.167855552" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen121vag.301575259" ; 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 Dec 06 14:20:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:03 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index b3c44207b4..428d1a9f8c 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.12.06.hellen128.1370348905" + signature = "rusEFI master.2023.12.06.hellen128.1247098098" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen128.1370348905" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen128.1247098098" ; 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 Dec 06 14:20:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:00 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9b70e38311..800f346527 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.12.06.hellen154hyundai.4182152197" + signature = "rusEFI master.2023.12.06.hellen154hyundai.3804134814" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen154hyundai.4182152197" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen154hyundai.3804134814" ; 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","K54 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 Dec 06 14:20:58 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:11 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6199,7 +6199,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6207,6 +6206,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index fbdd5375c6..a376503e36 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.12.06.hellen72.4063976494" + signature = "rusEFI master.2023.12.06.hellen72.3921917365" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen72.4063976494" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen72.3921917365" ; 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 Dec 06 14:21:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:21 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index dcfb278982..a69a56a7ee 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.12.06.hellen81.1127000172" + signature = "rusEFI master.2023.12.06.hellen81.1490305527" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen81.1127000172" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen81.1490305527" ; 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 Dec 06 14:21:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:24 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6199,7 +6199,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6207,6 +6206,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 01fc8ecc8c..7ba1a01c80 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.12.06.hellen88bmw.1885001671" + signature = "rusEFI master.2023.12.06.hellen88bmw.1805794908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellen88bmw.1885001671" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellen88bmw.1805794908" ; 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 Dec 06 14:21:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:13 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 770cb7f12e..b8394cff8c 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.12.06.hellenNA6.1970456103" + signature = "rusEFI master.2023.12.06.hellenNA6.1854549948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellenNA6.1970456103" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellenNA6.1854549948" ; 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 Dec 06 14:21:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:32 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 629cb10744..fe81e25abf 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.12.06.hellenNA8_96.332650216" + signature = "rusEFI master.2023.12.06.hellenNA8_96.137052019" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.hellenNA8_96.332650216" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.hellenNA8_96.137052019" ; 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 Dec 06 14:21:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:34 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 5ce40fd605..afa04da691 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.12.06.kin.3702431149" + signature = "rusEFI master.2023.12.06.kin.3344331830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.kin.3702431149" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.kin.3344331830" ; 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 Dec 06 14:20:30 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:39 UTC 2023 pageSize = 22504 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22494, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 9d08ac9d90..ba47d00d85 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.12.06.m74_9.112291754" + signature = "rusEFI master.2023.12.06.m74_9.491357745" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.m74_9.112291754" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.m74_9.491357745" ; 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","IAT sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","ETB position sensor 1 signal","ETB position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:21:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:45 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 69aaa23abd..eb3b57e4cb 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.12.06.mre_f4.3172119427" + signature = "rusEFI master.2023.12.06.mre_f4.2800376344" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.mre_f4.3172119427" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.mre_f4.2800376344" ; 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 or Hall Input","22 - AN temp 4 or Hall Input","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 Dec 06 14:21:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:42 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5284,8 +5284,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6203,7 +6203,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6211,6 +6210,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 1c17436f7c..5aa2619c5b 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.12.06.mre_f7.3172119427" + signature = "rusEFI master.2023.12.06.mre_f7.2800376344" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.mre_f7.3172119427" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.mre_f7.2800376344" ; 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 or Hall Input","22 - AN temp 4 or Hall Input","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 Dec 06 14:21:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:39 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5284,8 +5284,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6203,7 +6203,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6211,6 +6210,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index 2653ad159d..3776243841 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.12.06.nucleo_f429.2659146243" + signature = "rusEFI master.2023.12.06.nucleo_f429.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.nucleo_f429.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.nucleo_f429.2240263064" ; 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 Dec 06 14:21:50 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:10 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 6c48c0ca51..94639485fa 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.12.06.nucleo_f767.2659146243" + signature = "rusEFI master.2023.12.06.nucleo_f767.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.nucleo_f767.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.nucleo_f767.2240263064" ; 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 Dec 06 14:21:52 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:12 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 1356376029..9d35090c1a 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.12.06.nucleo_h743.2659146243" + signature = "rusEFI master.2023.12.06.nucleo_h743.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.nucleo_h743.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.nucleo_h743.2240263064" ; 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 Dec 06 14:21:54 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:15 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 346c0abfa1..2f7e7638e0 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.12.06.prometheus_405.2934675347" + signature = "rusEFI master.2023.12.06.prometheus_405.3037953544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.prometheus_405.2934675347" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.prometheus_405.3037953544" ; 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 Dec 06 14:21:38 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:57 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6195,7 +6195,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6203,6 +6202,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index ed2581fbb3..fd6e3be378 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.12.06.prometheus_469.2934675347" + signature = "rusEFI master.2023.12.06.prometheus_469.3037953544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.prometheus_469.2934675347" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.prometheus_469.3037953544" ; 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 Dec 06 14:21:36 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:55 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6195,7 +6195,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6203,6 +6202,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d93ce7892a..07c46166b1 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.12.06.proteus_f4.2657920121" + signature = "rusEFI master.2023.12.06.proteus_f4.2241088994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.proteus_f4.2657920121" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.proteus_f4.2241088994" ; 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 Dec 06 14:21:43 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:02 UTC 2023 pageSize = 27880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6210,7 +6210,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6218,6 +6217,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index df3b272bee..7571bd02d2 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.12.06.proteus_f7.2657920121" + signature = "rusEFI master.2023.12.06.proteus_f7.2241088994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.proteus_f7.2657920121" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.proteus_f7.2241088994" ; 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 Dec 06 14:21:40 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:00 UTC 2023 pageSize = 27880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6210,7 +6210,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6218,6 +6217,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index a2bade1f3e..1e4fefb3fe 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.12.06.proteus_h7.2657920121" + signature = "rusEFI master.2023.12.06.proteus_h7.2241088994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.proteus_h7.2657920121" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.proteus_h7.2241088994" ; 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 Dec 06 14:21:45 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:05 UTC 2023 pageSize = 27880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6210,7 +6210,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6218,6 +6217,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 004cfefcf5..7748733e54 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.12.06.s105.4048861797" + signature = "rusEFI master.2023.12.06.s105.3937162238" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.s105.4048861797" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.s105.3937162238" ; 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 Dec 06 14:21:30 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:47 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6201,7 +6201,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6209,6 +6208,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 561ef15d7e..b39e284471 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.06.small-can-board.2481939983" + signature = "rusEFI master.2023.12.06.small-can-board.2283245460" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.small-can-board.2481939983" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.small-can-board.2283245460" ; 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","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input","C4 - Analog/Digital Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:21:21 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:37 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 2955026a26..eb8f0bc23e 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.12.06.subaru_eg33_f7.2582813972" + signature = "rusEFI master.2023.12.06.subaru_eg33_f7.2181723279" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.subaru_eg33_f7.2582813972" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.subaru_eg33_f7.2181723279" ; 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 Dec 06 14:20:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:47:41 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index cd71e4fea3..1c5a7f2684 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.12.06.t-b-g.2659146243" + signature = "rusEFI master.2023.12.06.t-b-g.2240263064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.t-b-g.2659146243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.t-b-g.2240263064" ; 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 Dec 06 14:21:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:50 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 157d988164..66276f2a45 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.12.06.tdg-pdm8.349271585" + signature = "rusEFI master.2023.12.06.tdg-pdm8.254386106" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.tdg-pdm8.349271585" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.tdg-pdm8.254386106" ; 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 Dec 06 14:21:59 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:20 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6200,7 +6200,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6208,6 +6207,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index 2842df7cdc..5328cf57cc 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.12.06.uaefi.916670389" + signature = "rusEFI master.2023.12.06.uaefi.760983086" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.12.06.uaefi.916670389" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.12.06.uaefi.760983086" ; 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","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","INVALID","C14 TPS2","INVALID","D9 MAP","INVALID","D16 CLT","D15 IAT","C4 PPS2","C15 AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 14:21:02 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:48:16 UTC 2023 pageSize = 23880 page = 1 @@ -2370,7 +2370,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23870, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1440 + ochBlockSize = 1444 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3085,82 +3085,82 @@ vvtToothPosition3 = scalar, F32, 1268, "sync: Cam Tooth Position", 1, 0 vvtToothPosition4 = scalar, F32, 1272, "sync: Cam Tooth Position", 1, 0 triggerSyncGapRatio = scalar, F32, 1276, "", 1, 0 triggerStateIndex = scalar, U08, 1280, "", 1, 0 -camResyncCounter = scalar, U08, 1281, "", 1, 0 -vvtStateIndex = scalar, U08, 1282, "", 1, 0 +vvtStateIndex = scalar, U08, 1281, "", 1, 0 ; total TS size = 1284 -m_hasSynchronizedPhase = bits, U32, 1284, [0:0] -; total TS size = 1288 -wallFuelCorrection = scalar, F32, 1288, "", 1, 0 -wallFuel = scalar, F32, 1292, "", 1, 0 -; total TS size = 1296 -idleState = bits, S32, 1296, [0:2], "not important" -currentIdlePosition = scalar, F32, 1300 -baseIdlePosition = scalar, F32, 1304 -idleClosedLoop = scalar, F32, 1308 -iacByTpsTaper = scalar, F32, 1312 -throttlePedalUpState = scalar, S32, 1316, "", 1, 0 -mightResetPid = bits, U32, 1320, [0:0] -shouldResetPid = bits, U32, 1320, [1:1] -wasResetPid = bits, U32, 1320, [2:2] -mustResetPid = bits, U32, 1320, [3:3] -isCranking = bits, U32, 1320, [4:4] -isIacTableForCoasting = bits, U32, 1320, [5:5] -notIdling = bits, U32, 1320, [6:6] -needReset = bits, U32, 1320, [7:7] -isInDeadZone = bits, U32, 1320, [8:8] -isBlipping = bits, U32, 1320, [9:9] -useClosedLoop = bits, U32, 1320, [10:10] -badTps = bits, U32, 1320, [11:11] -looksLikeRunning = bits, U32, 1320, [12:12] -looksLikeCoasting = bits, U32, 1320, [13:13] -looksLikeCrankToIdle = bits, U32, 1320, [14:14] -isIdleCoasting = bits, U32, 1320, [15:15] -isIdleClosedLoop = bits, U32, 1320, [16:16] -idleTarget = scalar, S32, 1324, "", 1, 0 -targetRpmByClt = scalar, S32, 1328, "", 1, 0 -targetRpmAc = scalar, S32, 1332, "", 1, 0 -iacByRpmTaper = scalar, F32, 1336 -luaAdd = scalar, F32, 1340 -; total TS size = 1344 -idlePosition = scalar, F32, 1344, "per", 1,0 -trim = scalar, F32, 1348, "", 1, 0 -luaAdjustment = scalar, F32, 1352, "per", 1,0 -m_wastegatePosition = scalar, F32, 1356, "per", 1,0 -etbFeedForward = scalar, F32, 1360 -etbIntegralError = scalar, F32, 1364, "", 1, 0 -etbCurrentTarget = scalar, F32, 1368, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1372, "%", 1, 0 -etbRevLimitActive = bits, U32, 1376, [0:0] -jamDetected = bits, U32, 1376, [1:1] -etbDutyRateOfChange = scalar, F32, 1380, "per", 1,0 -etbDutyAverage = scalar, F32, 1384, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1388, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1390, "count", 1,0 -etbErrorCode = scalar, S08, 1392, "", 1, 0 -jamTimer = scalar, U16, 1394, "sec", 0.01, 0 -; total TS size = 1396 -faultCode = scalar, U08, 1396, "", 1, 0 -heaterDuty = scalar, U08, 1397, "%", 1, 0 -pumpDuty = scalar, U08, 1398, "%", 1, 0 -tempC = scalar, U16, 1400, "C", 1, 0 -nernstVoltage = scalar, U16, 1402, "V", 0.001, 0 -esr = scalar, U16, 1404, "ohm", 1, 0 -; total TS size = 1408 -dcOutput0 = scalar, F32, 1408, "per", 1,0 -isEnabled0_int = scalar, U08, 1412, "per", 1,0 -isEnabled0 = bits, U32, 1416, [0:0] -; total TS size = 1420 -value0 = scalar, U16, 1420, "value", 1,0 -value1 = scalar, U16, 1422, "value", 1,0 -errorRate = scalar, F32, 1424, "ratio", 1,0 -; total TS size = 1428 -vvtTarget = scalar, U16, 1428, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1430, "%", 0.5, 0 +camResyncCounter = scalar, U08, 1284, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1288, [0:0] +; total TS size = 1292 +wallFuelCorrection = scalar, F32, 1292, "", 1, 0 +wallFuel = scalar, F32, 1296, "", 1, 0 +; total TS size = 1300 +idleState = bits, S32, 1300, [0:2], "not important" +currentIdlePosition = scalar, F32, 1304 +baseIdlePosition = scalar, F32, 1308 +idleClosedLoop = scalar, F32, 1312 +iacByTpsTaper = scalar, F32, 1316 +throttlePedalUpState = scalar, S32, 1320, "", 1, 0 +mightResetPid = bits, U32, 1324, [0:0] +shouldResetPid = bits, U32, 1324, [1:1] +wasResetPid = bits, U32, 1324, [2:2] +mustResetPid = bits, U32, 1324, [3:3] +isCranking = bits, U32, 1324, [4:4] +isIacTableForCoasting = bits, U32, 1324, [5:5] +notIdling = bits, U32, 1324, [6:6] +needReset = bits, U32, 1324, [7:7] +isInDeadZone = bits, U32, 1324, [8:8] +isBlipping = bits, U32, 1324, [9:9] +useClosedLoop = bits, U32, 1324, [10:10] +badTps = bits, U32, 1324, [11:11] +looksLikeRunning = bits, U32, 1324, [12:12] +looksLikeCoasting = bits, U32, 1324, [13:13] +looksLikeCrankToIdle = bits, U32, 1324, [14:14] +isIdleCoasting = bits, U32, 1324, [15:15] +isIdleClosedLoop = bits, U32, 1324, [16:16] +idleTarget = scalar, S32, 1328, "", 1, 0 +targetRpmByClt = scalar, S32, 1332, "", 1, 0 +targetRpmAc = scalar, S32, 1336, "", 1, 0 +iacByRpmTaper = scalar, F32, 1340 +luaAdd = scalar, F32, 1344 +; total TS size = 1348 +idlePosition = scalar, F32, 1348, "per", 1,0 +trim = scalar, F32, 1352, "", 1, 0 +luaAdjustment = scalar, F32, 1356, "per", 1,0 +m_wastegatePosition = scalar, F32, 1360, "per", 1,0 +etbFeedForward = scalar, F32, 1364 +etbIntegralError = scalar, F32, 1368, "", 1, 0 +etbCurrentTarget = scalar, F32, 1372, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1376, "%", 1, 0 +etbRevLimitActive = bits, U32, 1380, [0:0] +jamDetected = bits, U32, 1380, [1:1] +etbDutyRateOfChange = scalar, F32, 1384, "per", 1,0 +etbDutyAverage = scalar, F32, 1388, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1392, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1394, "count", 1,0 +etbErrorCode = scalar, S08, 1396, "", 1, 0 +jamTimer = scalar, U16, 1398, "sec", 0.01, 0 +; total TS size = 1400 +faultCode = scalar, U08, 1400, "", 1, 0 +heaterDuty = scalar, U08, 1401, "%", 1, 0 +pumpDuty = scalar, U08, 1402, "%", 1, 0 +tempC = scalar, U16, 1404, "C", 1, 0 +nernstVoltage = scalar, U16, 1406, "V", 0.001, 0 +esr = scalar, U16, 1408, "ohm", 1, 0 +; total TS size = 1412 +dcOutput0 = scalar, F32, 1412, "per", 1,0 +isEnabled0_int = scalar, U08, 1416, "per", 1,0 +isEnabled0 = bits, U32, 1420, [0:0] +; total TS size = 1424 +value0 = scalar, U16, 1424, "value", 1,0 +value1 = scalar, U16, 1426, "value", 1,0 +errorRate = scalar, F32, 1428, "ratio", 1,0 ; total TS size = 1432 -lambdaCurrentlyGood = bits, U32, 1432, [0:0] -lambdaMonitorCut = bits, U32, 1432, [1:1] -lambdaTimeSinceGood = scalar, U16, 1436, "sec", 0.01, 0 -; total TS size = 1440 +vvtTarget = scalar, U16, 1432, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1434, "%", 0.5, 0 +; total TS size = 1436 +lambdaCurrentlyGood = bits, U32, 1436, [0:0] +lambdaMonitorCut = bits, U32, 1436, [1:1] +lambdaTimeSinceGood = scalar, U16, 1440, "sec", 0.01, 0 +; total TS size = 1444 time = { timeNow } @@ -5283,8 +5283,8 @@ entry = vvtToothPosition3, "vvtToothPosition 3", float, "%.3f" entry = vvtToothPosition4, "vvtToothPosition 4", float, "%.3f" entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = vvtStateIndex, "vvtStateIndex", int, "%d" +entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" entry = wallFuel, "Fuel on the wall", float, "%.3f" @@ -6199,7 +6199,6 @@ dialog = trigger_stateDialog, "trigger_state" liveGraph = trigger_state_3_Graph, "Graph", South graphLine = triggerSyncGapRatio graphLine = triggerStateIndex - graphLine = camResyncCounter graphLine = vvtStateIndex indicatorPanel = trigger_state_primaryIndicatorPanel, 2 @@ -6207,6 +6206,8 @@ indicatorPanel = trigger_state_primaryIndicatorPanel, 2 dialog = trigger_state_primaryDialog, "trigger_state_primary" panel = trigger_state_primaryIndicatorPanel + liveGraph = trigger_state_primary_1_Graph, "Graph", South + graphLine = camResyncCounter dialog = wall_fuel_stateDialog, "wall_fuel_state" 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 9ccf54fa7d..25203d3fd7 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 Mon Nov 27 20:20:54 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,10 +170,10 @@ public class DcMotors { public static final int TCU_GEAR_COUNT = 10; 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(1408); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1408); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1408); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1408); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1412); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1412); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1412); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1412); 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 898fa4837a..2aa3627a76 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 Mon Nov 27 20:20:54 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,23 +170,23 @@ public class ElectronicThrottle { public static final int TCU_GEAR_COUNT = 10; 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(1344); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1344); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1344); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1344); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1344); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1344); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1344); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1344); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1344); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1344); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1344); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1348); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1348); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1348); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1348); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1348); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1348); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1348); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1348); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1348); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1348); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1348); 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 45842d965c..4a24ffa395 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 Dec 06 14:22:07 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Dec 06 19:49:29 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1084,7 +1084,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 = 415350928; + public static final int SIGNATURE_HASH = 54077707; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1313,11 +1313,11 @@ 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.12.06.f407-discovery.415350928"; + public static final String TS_SIGNATURE = "rusEFI master.2023.12.06.f407-discovery.54077707"; public static final char TS_SIMULATE_CAN = '>'; 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 = 1440; + public static final int TS_TOTAL_OUTPUT_SIZE = 1444; 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 31ebf9c167..a50bb79dc4 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,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/idle_state.txt Mon Nov 27 20:20:53 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,34 +170,34 @@ public class IdleState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1296); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1296); - public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1296); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1296); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1296); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1296); - public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1296); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1296); - public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1296); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1296); - public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1296); - public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1296); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1296); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1296); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1296); - public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1296); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1296); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1296); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1296); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1296); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1296); - public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1296); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1296); - public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1296); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1300); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1300); + public static final Field IDLECLOSEDLOOP = Field.create("IDLECLOSEDLOOP", 12, FieldType.FLOAT).setBaseOffset(1300); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 16, FieldType.FLOAT).setBaseOffset(1300); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 20, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 24, FieldType.BIT, 0).setBaseOffset(1300); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 24, FieldType.BIT, 1).setBaseOffset(1300); + public static final Field WASRESETPID = Field.create("WASRESETPID", 24, FieldType.BIT, 2).setBaseOffset(1300); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 24, FieldType.BIT, 3).setBaseOffset(1300); + public static final Field ISCRANKING = Field.create("ISCRANKING", 24, FieldType.BIT, 4).setBaseOffset(1300); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 24, FieldType.BIT, 5).setBaseOffset(1300); + public static final Field NOTIDLING = Field.create("NOTIDLING", 24, FieldType.BIT, 6).setBaseOffset(1300); + public static final Field NEEDRESET = Field.create("NEEDRESET", 24, FieldType.BIT, 7).setBaseOffset(1300); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 24, FieldType.BIT, 8).setBaseOffset(1300); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 24, FieldType.BIT, 9).setBaseOffset(1300); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 24, FieldType.BIT, 10).setBaseOffset(1300); + public static final Field BADTPS = Field.create("BADTPS", 24, FieldType.BIT, 11).setBaseOffset(1300); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 24, FieldType.BIT, 12).setBaseOffset(1300); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 24, FieldType.BIT, 13).setBaseOffset(1300); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 24, FieldType.BIT, 14).setBaseOffset(1300); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 24, FieldType.BIT, 15).setBaseOffset(1300); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 24, FieldType.BIT, 16).setBaseOffset(1300); + public static final Field IDLETARGET = Field.create("IDLETARGET", 28, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 32, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field TARGETRPMAC = Field.create("TARGETRPMAC", 36, FieldType.INT).setScale(1.0).setBaseOffset(1300); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 40, FieldType.FLOAT).setBaseOffset(1300); + public static final Field LUAADD = Field.create("LUAADD", 44, FieldType.FLOAT).setBaseOffset(1300); 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 f93804194f..a6adb1099b 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 Mon Nov 27 20:20:54 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Wed Dec 06 19:47:30 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(1432); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1432); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1432); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1432); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1436); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1436); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1436); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1436); 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 1398670352..47dd612a54 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 Mon Nov 27 20:20:54 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,9 +170,9 @@ public class SentState { public static final int TCU_GEAR_COUNT = 10; 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(1420); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1420); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1420); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1424); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1424); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1424); public static final Field[] VALUES = { VALUE0, VALUE1, 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 564d8cdc5f..05a101fbaf 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 Mon Nov 27 20:20:53 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -180,9 +180,8 @@ public class TriggerState { public static final Field VVTTOOTHPOSITION4 = Field.create("VVTTOOTHPOSITION4", 28, FieldType.FLOAT).setBaseOffset(1244); public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 32, FieldType.FLOAT).setBaseOffset(1244); public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1244); - public static final Field ALIGNMENTFILL_AT_39 = Field.create("ALIGNMENTFILL_AT_39", 39, FieldType.INT8).setScale(1.0).setBaseOffset(1244); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1244); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1244); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, @@ -194,8 +193,7 @@ public class TriggerState { VVTTOOTHPOSITION4, TRIGGERSYNCGAPRATIO, TRIGGERSTATEINDEX, - CAMRESYNCCOUNTER, VVTSTATEINDEX, - ALIGNMENTFILL_AT_39, + ALIGNMENTFILL_AT_38, }; } 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 e72c67954b..39d096cbe3 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 Mon Nov 27 20:20:53 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 Dec 06 19:47:30 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -170,8 +170,12 @@ public class TriggerStatePrimary { public static final int TCU_GEAR_COUNT = 10; 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(1284); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1284); + public static final Field ALIGNMENTFILL_AT_1 = Field.create("ALIGNMENTFILL_AT_1", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1284); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 4, FieldType.BIT, 0).setBaseOffset(1284); public static final Field[] VALUES = { + CAMRESYNCCOUNTER, + ALIGNMENTFILL_AT_1, 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 b3b1f2cf3a..fbe3429e1c 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 Mon Nov 27 20:20:54 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Wed Dec 06 19:47:30 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(1428); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1428); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1428); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1432); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1432); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1432); 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 2277552c70..efa14237da 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 Mon Nov 27 20:20:53 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 Dec 06 19:47:30 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(1288); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1288); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1292); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1292); 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 ce21399193..238d851a22 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 Mon Nov 27 20:20:54 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Wed Dec 06 19:47:30 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(1396); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1396); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1396); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1396); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1396); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1396); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1396); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1396); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1400); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1400); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1400); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1400); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1400); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,