diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 81d68b883e..7bfdf8c07d 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -404,6 +404,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 2faff818b8..6b1fda85f6 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -211,6 +211,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index eb9a1fbefe..c060753cf9 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -964,6 +964,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 3cc78807cc..c7794fb7d1 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -453,7 +453,7 @@ mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -10000.0, 10000.0, ""), mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1104, 1.0, -10000.0, 10000.0, ""), mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1105, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1106, 1.0, -20.0, 100.0, "units"), +currentEngineDecodedPhase("Engine Phase2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1106, 1.0, 0.0, 0.0, "deg"), totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1112, 1.0, -10000.0, 10000.0, ""), vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -10000.0, 10000.0, ""), diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index 846ebf6add..62b68c5b1e 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 Aug 16 23:47:21 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 03:55:33 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -32,13 +32,13 @@ struct trigger_central_s { */ uint8_t mapVvt_map_peak = (uint8_t)0; /** - * need 4 byte alignment - units + * Engine Phase2 + deg * offset 38 */ - uint8_t alignmentFill_at_38[2]; + scaled_channel currentEngineDecodedPhase = (uint16_t)0; }; 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 Aug 16 23:47:21 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 03:55:33 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 94f3d4fcfb..bc6d435f2e 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -86,7 +86,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 Thu Sep 01 02:17:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:35 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 1250e5e202..edde854f75 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -86,7 +86,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 Thu Sep 01 02:17:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:14 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5609,6 +5611,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 7e86f71c3d..67957f4ae5 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -86,7 +86,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 Thu Sep 01 02:16:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:40 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5605,6 +5607,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index b5ba6d85cc..1b6c2172e6 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -86,7 +86,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 Thu Sep 01 02:16:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:42 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index b19b104a9d..4be54ab541 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -86,7 +86,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 Thu Sep 01 02:17:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:31 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 2621386753..0f7ffc80e2 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -86,7 +86,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 Thu Sep 01 02:17:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:12 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5609,6 +5611,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index c069df93f2..19d7bcd566 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -86,7 +86,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 Thu Sep 01 02:16:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Sep 01 03:55:37 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 069b61c3ae..a957dab91b 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -86,7 +86,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 Thu Sep 01 02:17:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:27 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 583c8f026f..08f0d82ca8 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -86,7 +86,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 Thu Sep 01 02:17:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:29 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7b25cf9cf2..8755a73e2e 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -86,7 +86,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 Thu Sep 01 02:17:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:16 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 62232b2091..c8132b2f4f 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -86,7 +86,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 Thu Sep 01 02:17:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:44 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 4c71e4d9fe..12ad8e879b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -86,7 +86,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 Thu Sep 01 02:17:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:02 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index f68f24ec7c..87174597a5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -86,7 +86,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 Thu Sep 01 02:17:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:00 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f0ff08f5b3..c155dbc223 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -86,7 +86,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 Thu Sep 01 02:17:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:50 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index f2d8ecf8fc..f50b812699 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -86,7 +86,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 Thu Sep 01 02:17:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:48 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index aa6f806af1..85e3949ff6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -86,7 +86,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 Thu Sep 01 02:17:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:46 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 7d278f3cf9..37978a4d7a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -86,7 +86,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 Thu Sep 01 02:17:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:52 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 9eba352464..68b8fa3eb5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -86,7 +86,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 Thu Sep 01 02:17:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:56 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 385cb59b11..49c3cfa896 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -86,7 +86,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 Thu Sep 01 02:17:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:58 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5606,6 +5608,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 5c5b462bb8..b931f63686 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -86,7 +86,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 Thu Sep 01 02:17:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:55:54 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 43317cb625..573eb0bcc5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -86,7 +86,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 Thu Sep 01 02:17:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:04 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4539d0b953..2bcdaa93ab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -86,7 +86,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 Thu Sep 01 02:17:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:06 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5608,6 +5610,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index ecf6530b73..a50c8a7732 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -86,7 +86,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 Thu Sep 01 02:16:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Sep 01 03:55:35 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 292d575ddf..aa427bc1cc 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -86,7 +86,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 Thu Sep 01 02:17:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:10 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5609,6 +5611,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 509debf253..e0a68f5873 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -86,7 +86,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 Thu Sep 01 02:17:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:08 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5609,6 +5611,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 45281bfd49..0d03ebd16c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -86,7 +86,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 Thu Sep 01 02:17:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:20 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5605,6 +5607,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 5ce0492a5b..4032147479 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -86,7 +86,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 Thu Sep 01 02:17:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:18 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5605,6 +5607,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a506e389da..6dd5d7717e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -86,7 +86,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 Thu Sep 01 02:17:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:24 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5605,6 +5607,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index feb21f310b..654d720243 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -86,7 +86,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 Thu Sep 01 02:17:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:21 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5605,6 +5607,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 71dc584ace..026775cc32 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -86,7 +86,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 Thu Sep 01 02:17:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:25 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5605,6 +5607,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase 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 da9c29ce19..b76f524f2e 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -86,7 +86,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 Thu Sep 01 02:16:55 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 Thu Sep 01 03:55:39 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5607,6 +5609,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index fabce667d7..f165adccd9 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -86,7 +86,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 Thu Sep 01 02:17:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Sep 01 03:56:33 UTC 2022 pageSize = 21300 page = 1 @@ -3090,6 +3090,7 @@ mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1096, "", 1, 0 mapVvt_MAP_AT_DIFF = scalar, F32, 1100, "", 1, 0 mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1104, "", 1, 0 mapVvt_map_peak = scalar, U08, 1105, "", 1, 0 +currentEngineDecodedPhase = scalar, U16, 1106, "deg", 1, 0 ; total TS size = 1108 totalRevolutionCounter = scalar, U32, 1108, "", 1, 0 vvtSyncGapRatio = scalar, F32, 1112, "", 1, 0 @@ -4846,6 +4847,7 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3 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 = currentEngineDecodedPhase, "Engine Phase2", int, "%d" entry = totalRevolutionCounter, "Crank revolution counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f" @@ -5611,6 +5613,7 @@ dialog = trigger_centralDialog, "trigger_central" graphLine = mapVvt_MAP_AT_DIFF graphLine = mapVvt_MAP_AT_CYCLE_COUNT graphLine = mapVvt_map_peak + graphLine = currentEngineDecodedPhase dialog = trigger_stateDialog, "trigger_state" 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 da4c0166d8..29168e39ce 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 Tue Aug 16 23:47:21 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Thu Sep 01 03:55:33 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -18,7 +18,7 @@ public class TriggerCentral { 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 CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 38, FieldType.INT16).setScale(1.0); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, @@ -31,6 +31,6 @@ public class TriggerCentral { MAPVVT_MAP_AT_DIFF, MAPVVT_MAP_AT_CYCLE_COUNT, MAPVVT_MAP_PEAK, - ALIGNMENTFILL_AT_38, + CURRENTENGINEDECODEDPHASE, }; }