diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 20b2116bf7..8ba38e7a75 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1954,7 +1954,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 804244456 +#define SIGNATURE_HASH 3640302469 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2536,12 +2536,12 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.804244456" +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.3640302469" #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 1000 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 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 37b3d9826b..f105fb6eac 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1939,7 +1939,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 3494512404 +#define SIGNATURE_HASH 660559737 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2521,12 +2521,12 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.23.kin.3494512404" +#define TS_SIGNATURE "rusEFI 2022.04.23.kin.660559737" #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 1000 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 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 14f56604cc..4ab82b9f7d 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 @@ -1933,7 +1933,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 1957514709 +#define SIGNATURE_HASH 2209881528 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2515,12 +2515,12 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.1957514709" +#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.2209881528" #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 1000 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 0c069c05f9..48c22b3573 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -397,6 +397,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index b9eb9274b9..e53e953fa6 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -176,6 +176,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 881672fa67..01a769aeff 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -791,59 +791,64 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 8216f3b932..447dfe3ed8 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -366,21 +366,26 @@ hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, F hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -1.0, -1.0, ""), hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -1.0, -1.0, ""), vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), -currentGap("currentGap", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -1.0, -1.0, ""), -wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), -currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), -baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), -targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 932, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 933, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 934, 1.0, -20.0, 100.0, "units"), +currentGap("currentGap", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), +currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), +baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), +targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 1b01d6a2b8..d601e0eb7b 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 / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1000 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1012 \ No newline at end of file diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 4d8a7c8bd4..ac6ea2cd4a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1954,7 +1954,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 1791198690 +#define SIGNATURE_HASH 2648102287 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2536,12 +2536,12 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.23.all.1791198690" +#define TS_SIGNATURE "rusEFI 2022.04.23.all.2648102287" #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 1000 +#define TS_TOTAL_OUTPUT_SIZE 1012 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index ed22b46f55..eda332e655 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1791198690 -#define TS_SIGNATURE "rusEFI 2022.04.23.all.1791198690" +#define SIGNATURE_HASH 2648102287 +#define TS_SIGNATURE "rusEFI 2022.04.23.all.2648102287" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index fbbaf1e88a..7f9a07b7cb 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2011191485 -#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-2chan.2011191485" +#define SIGNATURE_HASH 2163542224 +#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-2chan.2163542224" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 34fe099db0..e92c9dc201 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3815791126 -#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-4chan.3815791126" +#define SIGNATURE_HASH 342166139 +#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-4chan.342166139" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index c0427ad6d5..a8238f7f00 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1980330181 -#define TS_SIGNATURE "rusEFI 2022.04.23.atlas.1980330181" +#define SIGNATURE_HASH 2166104232 +#define TS_SIGNATURE "rusEFI 2022.04.23.atlas.2166104232" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 0e4f6365d2..80606f27c9 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1207700616 -#define TS_SIGNATURE "rusEFI 2022.04.23.core8.1207700616" +#define SIGNATURE_HASH 2968083685 +#define TS_SIGNATURE "rusEFI 2022.04.23.core8.2968083685" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 508403271d..41ddaa4d8a 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1791198690 -#define TS_SIGNATURE "rusEFI 2022.04.23.f429-discovery.1791198690" +#define SIGNATURE_HASH 2648102287 +#define TS_SIGNATURE "rusEFI 2022.04.23.f429-discovery.2648102287" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0badf93a89..0910180860 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 52043219 -#define TS_SIGNATURE "rusEFI 2022.04.23.frankenso_na6.52043219" +#define SIGNATURE_HASH 4094643646 +#define TS_SIGNATURE "rusEFI 2022.04.23.frankenso_na6.4094643646" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index a5e5ed1045..d029f715b7 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1033704183 -#define TS_SIGNATURE "rusEFI 2022.04.23.harley81.1033704183" +#define SIGNATURE_HASH 3397927578 +#define TS_SIGNATURE "rusEFI 2022.04.23.harley81.3397927578" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 9e712b35e4..b24e6b0d21 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 538513279 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen-nb1.538513279" +#define SIGNATURE_HASH 3607912210 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen-nb1.3607912210" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 9433f3ccbd..8137f07dda 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 930390940 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121nissan.930390940" +#define SIGNATURE_HASH 3227644913 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121nissan.3227644913" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f24cd0b6fe..03fe36ecba 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 881520245 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121vag.881520245" +#define SIGNATURE_HASH 3282026008 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121vag.3282026008" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 404286c980..e7f7993768 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1951498383 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen128.1951498383" +#define SIGNATURE_HASH 2202325218 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen128.2202325218" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 67e2c2d067..ec66f5bbb4 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3005650114 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen154hyundai.3005650114" +#define SIGNATURE_HASH 1144243375 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen154hyundai.1144243375" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 686ca4d322..2e5ce96c48 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2408954498 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen72.2408954498" +#define SIGNATURE_HASH 2021714671 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen72.2021714671" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 38be8cf309..ca202afa5b 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3950377316 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen81.3950377316" +#define SIGNATURE_HASH 476096777 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen81.476096777" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 4e3b85931d..c4f9a36106 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1654549695 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen88bmw.1654549695" +#define SIGNATURE_HASH 2508930258 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen88bmw.2508930258" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index b8a4744e2c..7902d25799 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3462778255 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA6.3462778255" +#define SIGNATURE_HASH 963681762 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA6.963681762" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 83c24cc39d..68fbf72e13 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1718888054 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA8_96.1718888054" +#define SIGNATURE_HASH 2439083547 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA8_96.2439083547" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index b2a5f67fe8..a6a0eb33f7 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 804244456 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.804244456" +#define SIGNATURE_HASH 3640302469 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.3640302469" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index ede8f5096d..783011bf4c 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 ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 3494512404 -#define TS_SIGNATURE "rusEFI 2022.04.23.kin.3494512404" +#define SIGNATURE_HASH 660559737 +#define TS_SIGNATURE "rusEFI 2022.04.23.kin.660559737" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index add4dc3e1d..c687613fe6 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 98782089 -#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f4.98782089" +#define SIGNATURE_HASH 4076215268 +#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f4.4076215268" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 409119da32..bc9e1b1e0d 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 98782089 -#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f7.98782089" +#define SIGNATURE_HASH 4076215268 +#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f7.4076215268" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index c0ba5dda42..6188ce1aa1 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 975789060 -#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_405.975789060" +#define SIGNATURE_HASH 3443264617 +#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_405.3443264617" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 15c45e39a3..5e93f01e85 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 975789060 -#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_469.975789060" +#define SIGNATURE_HASH 3443264617 +#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_469.3443264617" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e7fc29066b..1828e7b4e8 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1276779619 -#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f4.1276779619" +#define SIGNATURE_HASH 3138341902 +#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f4.3138341902" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b3f9b32a87..c57966b0ad 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1276779619 -#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f7.1276779619" +#define SIGNATURE_HASH 3138341902 +#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f7.3138341902" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 4c7c8068bb..59b73f4b70 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1276779619 -#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_h7.1276779619" +#define SIGNATURE_HASH 3138341902 +#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_h7.3138341902" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index f316effa03..773a4e0b06 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 ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 1957514709 -#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.1957514709" +#define SIGNATURE_HASH 2209881528 +#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.2209881528" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index ea875e8c08..07855b270d 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 ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2261962163 -#define TS_SIGNATURE "rusEFI 2022.04.23.tdg-pdm8.2261962163" +#define SIGNATURE_HASH 1908907486 +#define TS_SIGNATURE "rusEFI 2022.04.23.tdg-pdm8.1908907486" diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index e79f6523d7..2d937d45e0 100644 --- a/firmware/controllers/trigger/trigger_central_generated.h +++ b/firmware/controllers/trigger/trigger_central_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Apr 19 19:08:30 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Apr 23 22:00:05 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -15,8 +15,30 @@ struct trigger_central_s { * offset 24 */ int vvtCamCounter = (int)0; + /** + * offset 28 + */ + scaled_channel mapVvt_MAP_AT_SPECIAL_POINT = (float)0; + /** + * offset 32 + */ + scaled_channel mapVvt_MAP_AT_DIFF = (float)0; + /** + * offset 36 + */ + uint8_t mapVvt_MAP_AT_CYCLE_COUNT = (uint8_t)0; + /** + * offset 37 + */ + uint8_t mapVvt_map_peak = (uint8_t)0; + /** + * need 4 byte alignment + units + * offset 38 + */ + uint8_t alignmentFill_at_38[2]; }; -static_assert(sizeof(trigger_central_s) == 28); +static_assert(sizeof(trigger_central_s) == 40); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Apr 19 19:08:30 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Apr 23 22:00:05 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 7e0a763acb..a21b16b633 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.all.1791198690" + signature = "rusEFI 2022.04.23.all.2648102287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.all.1791198690" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.all.2648102287" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:37 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5319,6 +5328,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 7f708feda6..78abbdb4ee 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.alphax-2chan.2011191485" + signature = "rusEFI 2022.04.23.alphax-2chan.2163542224" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.alphax-2chan.2011191485" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.alphax-2chan.2163542224" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:06 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5313,6 +5322,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 7fe96cc00b..cba9c84a78 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.alphax-4chan.3815791126" + signature = "rusEFI 2022.04.23.alphax-4chan.342166139" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.alphax-4chan.3815791126" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.alphax-4chan.342166139" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:08 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5314,6 +5323,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 8ad64bcc1e..7756025695 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.atlas.1980330181" + signature = "rusEFI 2022.04.23.atlas.2166104232" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.atlas.1980330181" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.atlas.2166104232" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:35 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5319,6 +5328,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 9e96298b28..b7afaa6f6d 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.core8.1207700616" + signature = "rusEFI 2022.04.23.core8.2968083685" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.core8.1207700616" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.core8.2968083685" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:25 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5316,6 +5325,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 69614a9ce1..309c9c71ec 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.f429-discovery.1791198690" + signature = "rusEFI 2022.04.23.f429-discovery.2648102287" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.f429-discovery.1791198690" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.f429-discovery.2648102287" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:33 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5319,6 +5328,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index b617c953e8..e00ff3612b 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.frankenso_na6.52043219" + signature = "rusEFI 2022.04.23.frankenso_na6.4094643646" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.frankenso_na6.52043219" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.frankenso_na6.4094643646" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:26 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5319,6 +5328,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index dc7f404ecc..26cc89d806 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.harley81.1033704183" + signature = "rusEFI 2022.04.23.harley81.3397927578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.harley81.1033704183" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.harley81.3397927578" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:09 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index b372f3dc98..b30058ede7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen-nb1.538513279" + signature = "rusEFI 2022.04.23.hellen-nb1.3607912210" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen-nb1.538513279" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen-nb1.3607912210" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:19 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 4ca81a200e..223d02ef4b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen121nissan.930390940" + signature = "rusEFI 2022.04.23.hellen121nissan.3227644913" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen121nissan.930390940" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen121nissan.3227644913" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:13 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 4621e67591..9ab5af3547 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen121vag.881520245" + signature = "rusEFI 2022.04.23.hellen121vag.3282026008" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen121vag.881520245" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen121vag.3282026008" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:12 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index a7a48b4f1a..1b327e364a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen128.1951498383" + signature = "rusEFI 2022.04.23.hellen128.2202325218" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen128.1951498383" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen128.2202325218" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:10 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 4d0223abb1..e8ae7e37b6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen154hyundai.3005650114" + signature = "rusEFI 2022.04.23.hellen154hyundai.1144243375" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen154hyundai.3005650114" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen154hyundai.1144243375" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:24:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:14 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 190cd686de..f83e9ff955 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen72.2408954498" + signature = "rusEFI 2022.04.23.hellen72.2021714671" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen72.2408954498" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen72.2021714671" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:17 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index b5e7d23067..b2ba9f9033 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen81.3950377316" + signature = "rusEFI 2022.04.23.hellen81.476096777" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen81.3950377316" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen81.476096777" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:18 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5314,6 +5323,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index ffe234293d..8cc657c9be 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen88bmw.1654549695" + signature = "rusEFI 2022.04.23.hellen88bmw.2508930258" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen88bmw.1654549695" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen88bmw.2508930258" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:15 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index ffec23cc9c..b4722d195a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellenNA6.3462778255" + signature = "rusEFI 2022.04.23.hellenNA6.963681762" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellenNA6.3462778255" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellenNA6.963681762" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:20 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 44770713c0..012043125c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellenNA8_96.1718888054" + signature = "rusEFI 2022.04.23.hellenNA8_96.2439083547" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellenNA8_96.1718888054" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellenNA8_96.2439083547" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:21 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 0f2fc2a9de..2424ad53f5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen_cypress.804244456" + signature = "rusEFI 2022.04.23.hellen_cypress.3640302469" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen_cypress.804244456" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen_cypress.3640302469" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 23 21:25:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 23 22:00:39 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5319,6 +5328,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 9dfe266f8e..b9fdfe756c 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.kin.3494512404" + signature = "rusEFI 2022.04.23.kin.660559737" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.kin.3494512404" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.kin.660559737" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 23 21:25:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 23 22:00:38 UTC 2022 pageSize = 21136 page = 1 @@ -2147,7 +2147,7 @@ tcu_32Vals = array, U08, 21128, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2946,62 +2946,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4576,6 +4581,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5278,6 +5287,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 91afa16a9b..11494e85b2 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.mre_f4.98782089" + signature = "rusEFI 2022.04.23.mre_f4.4076215268" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.mre_f4.98782089" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.mre_f4.4076215268" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:24 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5316,6 +5325,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index c36ce9e7b4..5aef11732d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.mre_f7.98782089" + signature = "rusEFI 2022.04.23.mre_f7.4076215268" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.mre_f7.98782089" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.mre_f7.4076215268" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:23 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5316,6 +5325,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 205df0a93f..86c21ddea7 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.prometheus_405.975789060" + signature = "rusEFI 2022.04.23.prometheus_405.3443264617" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.prometheus_405.975789060" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.prometheus_405.3443264617" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:29 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5314,6 +5323,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 700487e5e8..626c6f9c67 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.prometheus_469.975789060" + signature = "rusEFI 2022.04.23.prometheus_469.3443264617" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.prometheus_469.975789060" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.prometheus_469.3443264617" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:27 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5314,6 +5323,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 121a76ebf4..85e6bb4015 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.proteus_f4.1276779619" + signature = "rusEFI 2022.04.23.proteus_f4.3138341902" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.proteus_f4.1276779619" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.proteus_f4.3138341902" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:31 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5312,6 +5321,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 1463baf91d..3c6118af42 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.proteus_f7.1276779619" + signature = "rusEFI 2022.04.23.proteus_f7.3138341902" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.proteus_f7.1276779619" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.proteus_f7.3138341902" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:30 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5312,6 +5321,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 61df2988f3..a0d5ba862d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.proteus_h7.1276779619" + signature = "rusEFI 2022.04.23.proteus_h7.3138341902" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.proteus_h7.1276779619" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.proteus_h7.3138341902" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:32 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5312,6 +5321,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index fe50824e6b..b600ea8092 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.subaru_eg33_f7.1957514709" + signature = "rusEFI 2022.04.23.subaru_eg33_f7.2209881528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.subaru_eg33_f7.1957514709" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.subaru_eg33_f7.2209881528" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:40 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5315,6 +5324,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index c74e0c0c8b..1855feb9fc 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.tdg-pdm8.2261962163" + signature = "rusEFI 2022.04.23.tdg-pdm8.1908907486" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.tdg-pdm8.2261962163" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.tdg-pdm8.1908907486" ; 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 @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:36 UTC 2022 pageSize = 21164 page = 1 @@ -2188,7 +2188,7 @@ tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1000 + ochBlockSize = 1012 ; ; see TunerStudioOutputChannels struct @@ -2987,62 +2987,67 @@ hwEventCounters4 = scalar, S32, 908, "", 1, 0 hwEventCounters5 = scalar, S32, 912, "", 1, 0 hwEventCounters6 = scalar, S32, 916, "", 1, 0 vvtCamCounter = scalar, S32, 920, "", 1, 0 -; total TS size = 924 -currentGap = scalar, F32, 924, "", 1, 0 -totalRevolutionCounter = scalar, U32, 928, "", 1, 0 -; total TS size = 932 -wallFuelCorrection = scalar, F32, 932, "", 1, 0 -wallFuel = scalar, F32, 936, "", 1, 0 -; total TS size = 940 -idleState = bits, S32, 940, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -currentIdlePosition = bits, F32, 944, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -baseIdlePosition = bits, F32, 948, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -iacByTpsTaper = bits, F32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -throttlePedalUpState = scalar, S32, 956, "", 1, 0 -mightResetPid = bits, U32, 960, [0:0] -shouldResetPid = bits, U32, 960, [1:1] -wasResetPid = bits, U32, 960, [2:2] -mustResetPid = bits, U32, 960, [3:3] -isCoasting = bits, U32, 960, [4:4] -useIacTableForCoasting = bits, U32, 960, [5:5] -notIdling = bits, U32, 960, [6:6] -needReset = bits, U32, 960, [7:7] -isInDeadZone = bits, U32, 960, [8:8] -isBlipping = bits, U32, 960, [9:9] -useClosedLoop = bits, U32, 960, [10:10] -badTps = bits, U32, 960, [11:11] -looksLikeRunning = bits, U32, 960, [12:12] -looksLikeCoasting = bits, U32, 960, [13:13] -looksLikeCrankToIdle = bits, U32, 960, [14:14] -useInstantRpmForIdle = bits, U32, 960, [15:15] -isVerboseIAC = bits, U32, 960, [16:16] -unusedBit_22_17 = bits, U32, 960, [17:17] -unusedBit_22_18 = bits, U32, 960, [18:18] -unusedBit_22_19 = bits, U32, 960, [19:19] -unusedBit_22_20 = bits, U32, 960, [20:20] -unusedBit_22_21 = bits, U32, 960, [21:21] -unusedBit_22_22 = bits, U32, 960, [22:22] -unusedBit_22_23 = bits, U32, 960, [23:23] -unusedBit_22_24 = bits, U32, 960, [24:24] -unusedBit_22_25 = bits, U32, 960, [25:25] -unusedBit_22_26 = bits, U32, 960, [26:26] -unusedBit_22_27 = bits, U32, 960, [27:27] -unusedBit_22_28 = bits, U32, 960, [28:28] -unusedBit_22_29 = bits, U32, 960, [29:29] -unusedBit_22_30 = bits, U32, 960, [30:30] -unusedBit_22_31 = bits, U32, 960, [31:31] -targetRpmByClt = scalar, S32, 964, "", 1, 0 -targetRpmAcBump = scalar, S32, 968, "", 1, 0 -; total TS size = 972 -baseDwell = scalar, F32, 972, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 976, "", 1, 0 -luaTimingAdd = scalar, F32, 980, "", 1, 0 -luaTimingMult = scalar, F32, 984, "", 1, 0 -; total TS size = 988 -idlePosition = scalar, F32, 988, "", 1, 0 -trim = scalar, F32, 992, "", 1, 0 -luaAdjustment = scalar, F32, 996, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 924, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 928, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 932, "", 1, 0 +mapVvt_map_peak = scalar, U08, 933, "", 1, 0 +alignmentFill_at_38 = array, U08, 934, [2], "units", 1, 0 +; total TS size = 936 +currentGap = scalar, F32, 936, "", 1, 0 +totalRevolutionCounter = scalar, U32, 940, "", 1, 0 +; total TS size = 944 +wallFuelCorrection = scalar, F32, 944, "", 1, 0 +wallFuel = scalar, F32, 948, "", 1, 0 +; total TS size = 952 +idleState = bits, S32, 952, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +currentIdlePosition = bits, F32, 956, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +baseIdlePosition = bits, F32, 960, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +iacByTpsTaper = bits, F32, 964, [0:2], "not important", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +throttlePedalUpState = scalar, S32, 968, "", 1, 0 +mightResetPid = bits, U32, 972, [0:0] +shouldResetPid = bits, U32, 972, [1:1] +wasResetPid = bits, U32, 972, [2:2] +mustResetPid = bits, U32, 972, [3:3] +isCoasting = bits, U32, 972, [4:4] +useIacTableForCoasting = bits, U32, 972, [5:5] +notIdling = bits, U32, 972, [6:6] +needReset = bits, U32, 972, [7:7] +isInDeadZone = bits, U32, 972, [8:8] +isBlipping = bits, U32, 972, [9:9] +useClosedLoop = bits, U32, 972, [10:10] +badTps = bits, U32, 972, [11:11] +looksLikeRunning = bits, U32, 972, [12:12] +looksLikeCoasting = bits, U32, 972, [13:13] +looksLikeCrankToIdle = bits, U32, 972, [14:14] +useInstantRpmForIdle = bits, U32, 972, [15:15] +isVerboseIAC = bits, U32, 972, [16:16] +unusedBit_22_17 = bits, U32, 972, [17:17] +unusedBit_22_18 = bits, U32, 972, [18:18] +unusedBit_22_19 = bits, U32, 972, [19:19] +unusedBit_22_20 = bits, U32, 972, [20:20] +unusedBit_22_21 = bits, U32, 972, [21:21] +unusedBit_22_22 = bits, U32, 972, [22:22] +unusedBit_22_23 = bits, U32, 972, [23:23] +unusedBit_22_24 = bits, U32, 972, [24:24] +unusedBit_22_25 = bits, U32, 972, [25:25] +unusedBit_22_26 = bits, U32, 972, [26:26] +unusedBit_22_27 = bits, U32, 972, [27:27] +unusedBit_22_28 = bits, U32, 972, [28:28] +unusedBit_22_29 = bits, U32, 972, [29:29] +unusedBit_22_30 = bits, U32, 972, [30:30] +unusedBit_22_31 = bits, U32, 972, [31:31] +targetRpmByClt = scalar, S32, 976, "", 1, 0 +targetRpmAcBump = scalar, S32, 980, "", 1, 0 +; total TS size = 984 +baseDwell = scalar, F32, 984, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 +luaTimingAdd = scalar, F32, 992, "", 1, 0 +luaTimingMult = scalar, F32, 996, "", 1, 0 ; total TS size = 1000 +idlePosition = scalar, F32, 1000, "", 1, 0 +trim = scalar, F32, 1004, "", 1, 0 +luaAdjustment = scalar, F32, 1008, "", 1, 0 +; total TS size = 1012 time = { timeNow } @@ -4617,6 +4622,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" entry = vvtCamCounter, "vvtCamCounter", int, "%d" +entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" +entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" +entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" +entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentGap, "currentGap", float, "%.3f" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = wallFuelCorrection, "fuel injection time correction to account for wall wetting effect for current cycle", float, "%.3f" @@ -5319,6 +5328,11 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = hwEventCounters5 graphLine = hwEventCounters6 graphLine = vvtCamCounter + graphLine = mapVvt_MAP_AT_SPECIAL_POINT + liveGraph = trigger_central_3_Graph, "Graph", South + graphLine = mapVvt_MAP_AT_DIFF + graphLine = mapVvt_MAP_AT_CYCLE_COUNT + graphLine = mapVvt_map_peak dialog = trigger_stateDialog, "trigger_state" 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 21f85d3e57..2499cbeaef 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 ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 21:25:26 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 22:00:42 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1880,7 +1880,6 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; - public static final int SIGNATURE_HASH = 1791198690; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2400,10 +2399,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.04.23.all.1791198690"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.23.all.2648102287"; 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 = 1000; + public static final int TS_TOTAL_OUTPUT_SIZE = 1012; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 3a94432e00..bcaebeb214 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger\trigger_central.txt Thu Apr 14 20:48:21 EDT 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Apr 23 22:00:05 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -14,6 +14,11 @@ public class TriggerCentral { public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0); public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0); public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, @@ -22,5 +27,10 @@ public class TriggerCentral { HWEVENTCOUNTERS5, HWEVENTCOUNTERS6, VVTCAMCOUNTER, + MAPVVT_MAP_AT_SPECIAL_POINT, + MAPVVT_MAP_AT_DIFF, + MAPVVT_MAP_AT_CYCLE_COUNT, + MAPVVT_MAP_PEAK, + ALIGNMENTFILL_AT_38, }; }