From 171bc28d3806fe4d8871c30d13ae6ee825a052b7 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 29 Jun 2022 06:06:27 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 2 + .../binary/generated/fancy_content.ini | 3 + .../binary/generated/output_channels.ini | 6 +- .../console/binary/generated/sensors.java | 7 +- .../controllers/algo/engine_state_generated.h | 25 +- firmware/tunerstudio/generated/rusefi.ini | 13 +- .../tunerstudio/generated/rusefi_48way.ini | 13 +- .../generated/rusefi_alphax-2chan.ini | 13 +- .../generated/rusefi_alphax-4chan.ini | 13 +- .../tunerstudio/generated/rusefi_atlas.ini | 13 +- .../tunerstudio/generated/rusefi_core8.ini | 13 +- .../generated/rusefi_f407-discovery.ini | 13 +- .../generated/rusefi_f429-discovery.ini | 13 +- .../generated/rusefi_frankenso_na6.ini | 13 +- .../tunerstudio/generated/rusefi_harley81.ini | 13 +- .../generated/rusefi_hellen-gm-e67.ini | 13 +- .../generated/rusefi_hellen-nb1.ini | 13 +- .../generated/rusefi_hellen121nissan.ini | 13 +- .../generated/rusefi_hellen121vag.ini | 13 +- .../generated/rusefi_hellen128mercedes.ini | 13 +- .../generated/rusefi_hellen154hyundai.ini | 13 +- .../tunerstudio/generated/rusefi_hellen72.ini | 13 +- .../tunerstudio/generated/rusefi_hellen81.ini | 13 +- .../generated/rusefi_hellen88bmw.ini | 13 +- .../generated/rusefi_hellenNA6.ini | 13 +- .../generated/rusefi_hellenNA8_96.ini | 13 +- .../generated/rusefi_hellen_cypress.ini | 13 +- .../tunerstudio/generated/rusefi_kinetis.ini | 13 +- .../tunerstudio/generated/rusefi_mre_f4.ini | 13 +- .../tunerstudio/generated/rusefi_mre_f7.ini | 13 +- .../generated/rusefi_prometheus_405.ini | 13 +- .../generated/rusefi_prometheus_469.ini | 13 +- .../generated/rusefi_proteus_f4.ini | 13 +- .../generated/rusefi_proteus_f7.ini | 13 +- .../generated/rusefi_proteus_h7.ini | 13 +- .../generated/rusefi_subaru_eg33_f7.ini | 13 +- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 13 +- .../rusefi/config/generated/EngineState.java | 398 +++++++++++++++++- 38 files changed, 741 insertions(+), 116 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d868502a6b..2b55739bf4 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -360,6 +360,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 2cb4c098e0..774fb38781 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -147,6 +147,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 9f46e08348..9bcc6d8864 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -453,8 +453,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index d8c09216d8..cb239af3bb 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -331,9 +331,10 @@ etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 81 targetFromTable("targetFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 816, 1.0, -1.0, -1.0, ""), sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), -cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 828, 1.0, -1.0, -1.0, ""), -hellenBoardId("How does this board self identifies", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 832, 1.0, 0.0, 3000.0, "id"), -alignmentFill_at_130("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 834, 1.0, -20.0, 100.0, "units"), +cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 828, 0.01, -20.0, 20.0, "deg"), +timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 830, 0.01, -20.0, 20.0, "deg"), +timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 832, 0.01, -20.0, 20.0, "deg"), +hellenBoardId("How does this board self identifies", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 834, 1.0, 0.0, 3000.0, "id"), tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index acbbc860f7..542c5ad20f 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 05:19:54 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 06:03:13 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -268,23 +268,28 @@ struct engine_state_s { */ angle_t dwellAngle = (angle_t)0; /** + deg * offset 124 */ - angle_t cltTimingCorrection = (angle_t)0; + scaled_channel cltTimingCorrection = (int16_t)0; + /** + deg + * offset 126 + */ + scaled_channel timingIatCorrection = (int16_t)0; + /** + deg + * offset 128 + */ + scaled_channel timingPidCorrection = (int16_t)0; /** * How does this board self identifies id - * offset 128 - */ - int16_t hellenBoardId = (int16_t)0; - /** - * need 4 byte alignment - units * offset 130 */ - uint8_t alignmentFill_at_130[2]; + int16_t hellenBoardId = (int16_t)0; }; static_assert(sizeof(engine_state_s) == 132); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 05:19:54 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 06:03:13 UTC 2022 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b52cd3e933..809a56a0d6 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -85,7 +85,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 Wed Jun 29 05:32:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:04:00 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index b73fc6494b..938ccd5b2a 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -85,7 +85,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 Wed Jun 29 05:31:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:43 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4914,6 +4918,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 84d48bd91d..5fbf9fa148 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -85,7 +85,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 Wed Jun 29 05:31:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:15 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4911,6 +4915,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 9d419b7839..c1f39f1123 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -85,7 +85,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 Wed Jun 29 05:31:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:17 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4912,6 +4916,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index c407ab3d6b..f273b1eafb 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -85,7 +85,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 Wed Jun 29 05:32:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:57 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 221391e6e5..03046c8945 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -85,7 +85,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 Wed Jun 29 05:31:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:41 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4914,6 +4918,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index c5259cbf18..f95b26d68f 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -85,7 +85,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 Wed Jun 29 05:31:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:54 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 5ec05f1371..9b50e4d0f5 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -85,7 +85,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 Wed Jun 29 05:31:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:56 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 142f40d752..80206de1ae 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -85,7 +85,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 Wed Jun 29 05:31:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:44 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index c1e76aac06..1dac871bac 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -85,7 +85,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 Wed Jun 29 05:31:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:18 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index c3cc1a12c9..2831c0f8cd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -85,7 +85,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 Wed Jun 29 05:31:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:33 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index a3fd158b62..22c90987e1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -85,7 +85,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 Wed Jun 29 05:31:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:31 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8cc5ab240c..7e4b246a2d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -85,7 +85,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 Wed Jun 29 05:31:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:23 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 347254c764..be07b79e6a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -85,7 +85,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 Wed Jun 29 05:31:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:22 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 3a073c6370..1f4b7f9701 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -85,7 +85,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 Wed Jun 29 05:31:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:20 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 865d46a984..2a6c31abc6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -85,7 +85,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 Wed Jun 29 05:31:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:25 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c285c4bdf3..94eba30af5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -85,7 +85,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 Wed Jun 29 05:31:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:28 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index a24ee3c7b5..90e79edc07 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -85,7 +85,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 Wed Jun 29 05:31:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:30 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4912,6 +4916,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index d03ddca5eb..87a1c43fb0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -85,7 +85,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 Wed Jun 29 05:31:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:26 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index ed1fc7a453..8c820b0fe3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -85,7 +85,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 Wed Jun 29 05:31:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:35 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index b2a29d0420..11797ba2bd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -85,7 +85,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 Wed Jun 29 05:31:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:36 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index b43f002783..a4bb609d44 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -85,7 +85,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 Wed Jun 29 05:32:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 29 06:04:03 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 362c3459aa..85e0c32525 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -85,7 +85,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 Wed Jun 29 05:32:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 29 06:04:02 UTC 2022 pageSize = 21324 page = 1 @@ -2525,8 +2525,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4159,6 +4161,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4878,6 +4882,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 768135af45..be6b237314 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -85,7 +85,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 Wed Jun 29 05:31:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:40 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4914,6 +4918,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a5ddb7ebe7..b47f78ee16 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -85,7 +85,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 Wed Jun 29 05:31:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:38 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4914,6 +4918,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f7f2359803..ae0f8003f6 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -85,7 +85,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 Wed Jun 29 05:31:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:48 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4912,6 +4916,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 71451abc6f..37ae1cb10e 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -85,7 +85,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 Wed Jun 29 05:31:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:46 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4912,6 +4916,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 224534180f..44c6ee1e45 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -85,7 +85,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 Wed Jun 29 05:31:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:51 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4910,6 +4914,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 51d90c8be1..c760eeebc4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -85,7 +85,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 Wed Jun 29 05:31:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:49 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4910,6 +4914,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index d7b7c62f1f..faf7d16291 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -85,7 +85,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 Wed Jun 29 05:31:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:52 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4910,6 +4914,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 47a77d013d..bc8ba6042f 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -85,7 +85,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 Wed Jun 29 05:32:08 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 Wed Jun 29 06:04:05 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4913,6 +4917,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 29088f8ac6..f7059171d0 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -85,7 +85,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 Wed Jun 29 05:32:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 06:03:59 UTC 2022 pageSize = 21352 page = 1 @@ -2564,8 +2564,10 @@ etbFeedForward = scalar, F32, 812, "", 1, 0 targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 -cltTimingCorrection = scalar, F32, 828, "", 1, 0 -hellenBoardId = scalar, S16, 832, "id", 1, 0 +cltTimingCorrection = scalar, S16, 828, "deg", 0.01, 0 +timingIatCorrection = scalar, S16, 830, "deg", 0.01, 0 +timingPidCorrection = scalar, S16, 832, "deg", 0.01, 0 +hellenBoardId = scalar, S16, 834, "id", 1, 0 ; total TS size = 836 tpsFrom = scalar, F32, 836, "", 1, 0 tpsTo = scalar, F32, 840, "", 1, 0 @@ -4198,6 +4200,8 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = timingIatCorrection, "timingIatCorrection", float, "%.3f" +entry = timingPidCorrection, "timingPidCorrection", float, "%.3f" entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" @@ -4917,6 +4921,9 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = timingIatCorrection + liveGraph = engine_state_9_Graph, "Graph", South + graphLine = timingPidCorrection graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 9d45965e3b..7a5d9e3a6b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,11 +1,397 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 05:19:54 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 06:03:13 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class EngineState { + public static final int ADC_CHANNEL_NONE = 0; + public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; + public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; + public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; + public static final int AUX_ANALOG_INPUT_COUNT = 8; + public static final int AUX_DIGITAL_VALVE_COUNT = 2; + public static final int BANKS_COUNT = 2; + public static final int BARO_CORR_SIZE = 4; + public static final int BLOCKING_FACTOR = 500; + public static final int BOOST_LOAD_COUNT = 8; + public static final int BOOST_RPM_COUNT = 8; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; + public static final int CAN_DEFAULT_BASE = 0x200; + public static final int CAN_ECU_SERIAL_RX_ID = 0x100; + public static final int CAN_ECU_SERIAL_TX_ID = 0x102; + public static final String CAN_RX_PREFIX = "CAN_rx"; + public static final int CLT_CRANKING_CURVE_SIZE = 8; + public static final int CLT_CURVE_SIZE = 16; + public static final int CLT_LIMITER_CURVE_SIZE = 4; + public static final int CLT_TIMING_CURVE_SIZE = 8; + public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; + public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; + public static final String CMD_BOOST_PIN = "set_boost_pin"; + public static final String CMD_BURNCONFIG = "burnconfig"; + public static final String CMD_DATE = "date"; + public static final String CMD_DISABLE = "disable"; + public static final String CMD_ENABLE = "enable"; + public static final String CMD_ENGINE_TYPE = "engine_type"; + public static final String CMD_ENGINESNIFFERRPMTHRESHOLD = "engineSnifferRpmThreshold"; + public static final String CMD_ETB_DUTY = "set_etb_duty"; + public static final String CMD_EXTERNAL_STIMULATION = "ext_stimulation"; + public static final String CMD_FAN2_BENCH = "fan2bench"; + public static final String CMD_FAN_BENCH = "fanbench"; + public static final String CMD_FUEL_BENCH = "fuelbench"; + public static final String CMD_FUEL_PUMP_BENCH = "fuelpumpbench"; + public static final String CMD_FUNCTIONAL_TEST_MODE = "test_mode"; + public static final String CMD_GET = "get"; + public static final String CMD_HPFP_BENCH = "hpfpbench"; + public static final String CMD_IDLE_BENCH = "idlebench"; + public static final String CMD_IDLE_PIN = "set_idle_pin"; + public static final String CMD_IGNITION = "ignition"; + public static final String CMD_IGNITION_PIN = "set_ignition_pin"; + public static final String CMD_INJECTION = "injection"; + public static final String CMD_INJECTION_PIN = "set_injection_pin"; + public static final String CMD_LOGIC_PIN = "set_logic_input_pin"; + public static final String CMD_MIL_BENCH = "milbench"; + public static final String CMD_PINS = "pins"; + public static final String CMD_PWM = "pwm"; + public static final String CMD_REBOOT = "reboot"; + public static final String CMD_REBOOT_DFU = "reboot_dfu"; + public static final String CMD_REBOOT_OPENBLT = "reboot_openblt"; + public static final String CMD_RESET_ENGINE_SNIFFER = "reset_engine_chart"; + public static final String CMD_RPM = "rpm"; + public static final String CMD_SELF_STIMULATION = "self_stimulation"; + public static final String CMD_SET = "set"; + public static final String CMD_SPARK_BENCH = "sparkbench"; + public static final String CMD_STARTER_BENCH = "starterbench"; + public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input"; + public static final String CMD_TRIGGER_PIN = "set_trigger_input_pin"; + public static final String CMD_TRIGGER_SIMULATOR_PIN = "set_trigger_simulator_pin"; + public static final String CMD_TRIGGERINFO = "triggerinfo"; + public static final int CMD_TS_BENCH_CATEGORY = 22; + public static final int CMD_TS_LUA_OUTPUT_CATEGORY = 33; + public static final int CMD_TS_SOLENOID_CATEGORY = 41; + public static final int CMD_TS_X14 = 20; + public static final int CMD_TS_X31 = 49; + public static final String CMD_VSS_PIN = "vss_pin"; + public static final String CMD_WRITECONFIG = "writeconfig"; + public static final int COMPOSITE_DATA_LENGTH = 2500; + public static final int COMPOSITE_DATA_LENGTH_HALF = 1250; + public static final int COMPOSITE_PACKET_COUNT = 500; + public static final int COMPOSITE_PACKET_SIZE = 5; + public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; + public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; + public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; + public static final int CRANKING_CURVE_SIZE = 8; + public static final String CRITICAL_PREFIX = "CRITICAL"; + public static final int DC_PER_STEPPER = 2; + public static final int DIGIPOT_COUNT = 4; + public static final int DWELL_CURVE_SIZE = 8; + public static final int EGT_CHANNEL_COUNT = 8; + public static final String ENGINE_MAKE_BMW = "BMW"; + public static final String ENGINE_MAKE_GM = "GM"; + public static final String ENGINE_MAKE_HONDA = "Honda"; + public static final String ENGINE_MAKE_Hyundai = "Hyundai"; + public static final String ENGINE_MAKE_LADA = "Lada"; + public static final String ENGINE_MAKE_MAZDA = "Mazda"; + public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; + public static final String ENGINE_MAKE_NISSAN = "Nissan"; + public static final String ENGINE_MAKE_SUBARU = "Subaru"; + public static final String ENGINE_MAKE_TOYOTA = "Toyota"; + public static final String ENGINE_MAKE_VAG = "VAG"; + public static final int ENGINE_NOISE_CURVE_SIZE = 16; + public static final int ENGINE_SNIFFER_UNIT_US = 10; + public static final int ERROR_BUFFER_SIZE = 120; + public static final int ETB_BIAS_CURVE_LENGTH = 8; + public static final int ETB_COUNT = 2; + public static final int ETB_HW_MAX_FREQUENCY = 3000; + public static final int FLASH_DATA_VERSION = 10012; + public static final int FUEL_LEVEL_TABLE_COUNT = 8; + public static final int FUEL_LOAD_COUNT = 16; + public static final int FUEL_RPM_COUNT = 16; + public static final int GAP_TRACKING_LENGTH = 18; + public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; + public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; + public static final String GAUGE_NAME_ACCEL_X = "Acceleration: X"; + public static final String GAUGE_NAME_ACCEL_Y = "Acceleration: Y"; + public static final String GAUGE_NAME_ACCEL_YAW = "Acceleration: Yaw"; + public static final String GAUGE_NAME_ACCEL_Z = "Acceleration: Z"; + public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio"; + public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; + public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_MASS = "air mass"; + public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; + public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; + public static final String GAUGE_NAME_AUX_TEMP1 = "Aux temp 1"; + public static final String GAUGE_NAME_AUX_TEMP2 = "Aux temp 2"; + public static final String GAUGE_NAME_BARO_PRESSURE = "Barometric pressure"; + public static final String GAUGE_NAME_BOOST_CLOSED_LOOP = "Boost Closed Loop"; + public static final String GAUGE_NAME_BOOST_OPEN_LOOP = "Boost Open Loop"; + public static final String GAUGE_NAME_BOOST_OUTPUT = "Boost Output"; + public static final String GAUGE_NAME_BOOST_TARGET = "Boost Target"; + public static final String GAUGE_NAME_CLT = "CLT"; + public static final String GAUGE_NAME_CPU_TEMP = "CPU Temperature"; + public static final String GAUGE_NAME_CURRENT_GEAR = "Current Gear"; + public static final String GAUGE_NAME_DEBUG_F1 = "debug f1"; + public static final String GAUGE_NAME_DEBUG_F2 = "debug f2: iTerm"; + public static final String GAUGE_NAME_DEBUG_F3 = "debug f3: prevError"; + public static final String GAUGE_NAME_DEBUG_F4 = "debug f4: iParam"; + public static final String GAUGE_NAME_DEBUG_F5 = "debug f5: dParam"; + public static final String GAUGE_NAME_DEBUG_F6 = "debug f6: dTerm"; + public static final String GAUGE_NAME_DEBUG_F7 = "debug f7"; + public static final String GAUGE_NAME_DEBUG_I1 = "debug i1: pParam"; + public static final String GAUGE_NAME_DEBUG_I2 = "debug i2: offset"; + public static final String GAUGE_NAME_DEBUG_I3 = "debug i3"; + public static final String GAUGE_NAME_DEBUG_I4 = "debug i4"; + public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; + public static final String GAUGE_NAME_DESIRED_GEAR = "Desired Gear"; + public static final String GAUGE_NAME_DETECTED_GEAR = "Detected Gear"; + public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; + public static final String GAUGE_NAME_ECU_TEMPERATURE = "ECU temperature"; + public static final String GAUGE_NAME_ENGINE_CRC16 = "Engine CRC16"; + public static final String GAUGE_NAME_ETB_DUTY = "ETB Duty"; + public static final String GAUGE_NAME_ETB_ERROR = "ETB position error"; + public static final String GAUGE_NAME_ETB_TARGET = "ETB position target"; + public static final String GAUGE_NAME_FLEX = "Flex Ethanol %"; + public static final String GAUGE_NAME_FUEL_BARO_CORR = "fuel: Barometric pressure correction"; + public static final String GAUGE_NAME_FUEL_BASE = "fuel: base mass"; + public static final String GAUGE_NAME_FUEL_CHARGE_TEMP = "fuel: Estimated charge temperature"; + public static final String GAUGE_NAME_FUEL_CLT_CORR = "fuel: CLT correction"; + public static final String GAUGE_NAME_FUEL_CONSUMPTION = "fuel: Total consumed"; + public static final String GAUGE_NAME_FUEL_CRANKING = "fuel: cranking"; + public static final String GAUGE_NAME_FUEL_EL_EXTRA = "fuel: engine load acceleration extra fuel"; + public static final String GAUGE_NAME_FUEL_FLOW = "fuel: Flow rate"; + public static final String GAUGE_NAME_FUEL_IAT_CORR = "fuel: IAT correction"; + public static final String GAUGE_NAME_FUEL_INJ_DUTY = "fuel: injector duty cycle"; + public static final String GAUGE_NAME_FUEL_LAST_INJECTION = "fuel: Last injection"; + public static final String GAUGE_NAME_FUEL_LEVEL = "fuel level"; + public static final String GAUGE_NAME_FUEL_LOAD = "fuel: load"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH = "Fuel pressure (high)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS = "bar"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW = "Fuel pressure (low)"; + public static final String GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS = "kPa"; + public static final String GAUGE_NAME_FUEL_RUNNING = "fuel: running"; + public static final String GAUGE_NAME_FUEL_TPS_EXTRA = "fuel: TPS acceleration extra fuel ms"; + public static final String GAUGE_NAME_FUEL_TPS_ROC = "fuel: TPS change"; + public static final String GAUGE_NAME_FUEL_TRIM = "fuel: fuel trim"; + public static final String GAUGE_NAME_FUEL_TRIM_2 = "fuel: fuel trim 2"; + public static final String GAUGE_NAME_FUEL_VE = "fuel: VE"; + public static final String GAUGE_NAME_FUEL_WALL_AMOUNT = "fuel: wall amount"; + public static final String GAUGE_NAME_FUEL_WALL_CORRECTION = "fuel: wall correction"; + public static final String GAUGE_NAME_FW_VERSION = "ECU Software Version"; + public static final String GAUGE_NAME_GEAR_RATIO = "Gearbox Ratio"; + public static final String GAUGE_NAME_IAC = "Idle Air Valve"; + public static final String GAUGE_NAME_IAT = "IAT"; + public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; + public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; + public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; + public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; + public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; + public static final String GAUGE_NAME_KNOCK_10 = "knock 10"; + public static final String GAUGE_NAME_KNOCK_11 = "knock 11"; + public static final String GAUGE_NAME_KNOCK_12 = "knock 12"; + public static final String GAUGE_NAME_KNOCK_2 = "knock 2"; + public static final String GAUGE_NAME_KNOCK_3 = "knock 3"; + public static final String GAUGE_NAME_KNOCK_4 = "knock 4"; + public static final String GAUGE_NAME_KNOCK_5 = "knock 5"; + public static final String GAUGE_NAME_KNOCK_6 = "knock 6"; + public static final String GAUGE_NAME_KNOCK_7 = "knock 7"; + public static final String GAUGE_NAME_KNOCK_8 = "knock 8"; + public static final String GAUGE_NAME_KNOCK_9 = "knock 9"; + public static final String GAUGE_NAME_KNOCK_COUNTER = "knock: count"; + public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level"; + public static final String GAUGE_NAME_KNOCK_RETARD = "knock: retard"; + public static final String GAUGE_NAME_LAMBDA = "Lambda"; + public static final String GAUGE_NAME_LAMBDA2 = "Lambda 2"; + public static final String GAUGE_NAME_LAST_ERROR = "Last error"; + public static final String GAUGE_NAME_MAF = "MAF"; + public static final String GAUGE_NAME_MAP = "MAP"; + public static final String GAUGE_NAME_OIL_PRESSURE = "Oil Pressure"; + public static final String GAUGE_NAME_OIL_PRESSURE_UNITS = "kPa"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH = "Fuel pressure raw (high)"; + public static final String GAUGE_NAME_RAW_FUEL_PRESSURE_LOW = "Fuel pressure raw (low)"; + public static final String GAUGE_NAME_RPM = "RPM"; + public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; + public static final String GAUGE_NAME_TARGET_LAMBDA = "fuel: target lambda"; + public static final String GAUGE_NAME_TC_RATIO = "Torque Converter Ratio"; + public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; + public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; + public static final String GAUGE_NAME_TIME = "Time"; + public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; + public static final String GAUGE_NAME_TPS = "TPS"; + public static final String GAUGE_NAME_TPS2 = "TPS2"; + public static final String GAUGE_NAME_TRG_ERR = "Trigger Error Counter"; + public static final String GAUGE_NAME_TRG_GAP = "Trigger Sync Latest Ratio"; + public static final String GAUGE_NAME_TUNE_CRC16 = "Tune CRC16"; + public static final String GAUGE_NAME_TURBO_SPEED = "Turbocharger Speed"; + public static final String GAUGE_NAME_UPTIME = "Uptime"; + public static final String GAUGE_NAME_VBAT = "VBatt"; + public static final String GAUGE_NAME_VERSION = "firmware"; + public static final String GAUGE_NAME_VVS = "Vehicle Speed"; + public static final String GAUGE_NAME_VVT_B1E = "VVT: bank 1 exhaust"; + public static final String GAUGE_NAME_VVT_B1I = "VVT: bank 1 intake"; + public static final String GAUGE_NAME_VVT_B2E = "VVT: bank 2 exhaust"; + public static final String GAUGE_NAME_VVT_B2I = "VVT: bank 2 intake"; + public static final String GAUGE_NAME_VVT_TARGET_B1E = "VVT: bank 1 exhaust target"; + public static final String GAUGE_NAME_VVT_TARGET_B1I = "VVT: bank 1 intake target"; + public static final String GAUGE_NAME_VVT_TARGET_B2E = "VVT: bank 2 exhaust target"; + public static final String GAUGE_NAME_VVT_TARGET_B2I = "VVT: bank 2 intake target"; + public static final String GAUGE_NAME_WARNING_COUNT = "Warning count"; + public static final String GAUGE_NAME_WARNING_COUNTER = "warning: counter"; + public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; + public static final String GAUGE_NAME_WG_POSITION = "Wastegate position sensor"; + public static final int GEARS_COUNT = 8; + public static final int GPPWM_CHANNELS = 4; + public static final int GPPWM_LOAD_COUNT = 8; + public static final int GPPWM_NOTE_SIZE = 16; + public static final int GPPWM_RPM_COUNT = 8; + public static final int HPFP_COMPENSATION_SIZE = 10; + public static final int HPFP_DEADTIME_SIZE = 8; + public static final int HPFP_LOBE_PROFILE_SIZE = 16; + public static final int HPFP_TARGET_SIZE = 10; + public static final int HW_MAX_ADC_INDEX = 17; + public static final int IAC_PID_MULT_SIZE = 8; + public static final int IAT_CURVE_SIZE = 16; + public static final int IDLE_ADVANCE_CURVE_SIZE = 8; + public static final int IDLE_VE_SIZE = 4; + public static final int IGN_LOAD_COUNT = 16; + public static final int IGN_RPM_COUNT = 16; + public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; + public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; + public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; + public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; + public static final int LE_COMMAND_LENGTH = 200; + public static final String LOG_DELIMITER = "`"; + public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; + public static final int LUA_ANALOG_INPUT_COUNT = 8; + public static final int LUA_PWM_COUNT = 8; + public static final int LUA_SCRIPT_SIZE = 8000; + public static final int MAF_DECODING_COUNT = 256; + public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; + public static final int MAP_ANGLE_SIZE = 8; + public static final int MAP_WINDOW_SIZE = 8; + public static final int MAX_CYLINDER_COUNT = 12; + public static final int MLQ_FIELD_HEADER_SIZE = 55; + public static final int MLQ_HEADER_SIZE = 22; + public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; + public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; + public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; + public static final int PACK_ADD_TEMPERATURE = 40; + public static final int PACK_MULT_AFR = 1000; + public static final int PACK_MULT_AFR_CFG = 10; + public static final int PACK_MULT_ANGLE = 50; + public static final int PACK_MULT_FUEL_FLOW = 200; + public static final int PACK_MULT_FUEL_MASS = 100; + public static final int PACK_MULT_HIGH_PRESSURE = 10; + public static final int PACK_MULT_LAMBDA = 10000; + public static final int PACK_MULT_LAMBDA_CFG = 147; + public static final int PACK_MULT_MASS_FLOW = 10; + public static final int PACK_MULT_MS = 300; + public static final int PACK_MULT_PERCENT = 100; + public static final int PACK_MULT_PRESSURE = 30; + public static final int PACK_MULT_TEMPERATURE = 100; + public static final int PACK_MULT_VOLTAGE = 1000; + public static final int PEDAL_TO_TPS_SIZE = 8; + public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; + public static final String PROTOCOL_COIL1_SHORT_NAME = "c1"; + public static final String PROTOCOL_CRANK1 = "t1"; + public static final String PROTOCOL_CRANK2 = "t2"; + public static final String PROTOCOL_CRANK3 = "t3"; + public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; + public static final String PROTOCOL_ES_DOWN = "d"; + public static final String PROTOCOL_ES_UP = "u"; + public static final String PROTOCOL_HELLO_PREFIX = "***"; + public static final String PROTOCOL_HIP_NAME = "HIP"; + public static final String PROTOCOL_HPFP_NAME = "hpfp"; + public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; + public static final String PROTOCOL_MSG = "msg"; + public static final String PROTOCOL_OUTPIN = "outpin"; + public static final String PROTOCOL_SIGNATURE_PREFIX = "rusEFI "; + public static final String PROTOCOL_TACH_NAME = "tach"; + public static final String PROTOCOL_TEST_RESPONSE_TAG = "ts_p_alive"; + public static final String PROTOCOL_VERSION_TAG = "rusEfiVersion"; + public static final String PROTOCOL_VVT1_NAME = "VVT1"; + public static final String PROTOCOL_VVT2_NAME = "VVT2"; + public static final String PROTOCOL_VVT3_NAME = "VVT3"; + public static final String PROTOCOL_VVT4_NAME = "VVT4"; + public static final String PROTOCOL_WA_CHANNEL_1 = "input1"; + public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; + public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; + public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; + public static final int RPM_1_BYTE_PACKING_MULT = 50; + public static final int SCRIPT_CURVE_16 = 16; + public static final int SCRIPT_CURVE_8 = 8; + public static final int SCRIPT_CURVE_COUNT = 6; + public static final int SCRIPT_SETTING_COUNT = 8; + public static final int SCRIPT_TABLE_8 = 8; + public static final int SCRIPT_TABLE_COUNT = 4; + public static final int SERVO_COUNT = 8; + public static final int STFT_BANK_COUNT = 2; + public static final int STFT_CELL_COUNT = 4; + public static final int TCU_GEAR_COUNT = 10; + public static final int TCU_MAGIC_SIZE = 8; + public static final int TCU_SOLENOID_COUNT = 6; + public static final int TOOTH_DATA_LENGTH = 2000; + public static final int TOOTH_PACKET_COUNT = 1000; + public static final int TOOTH_PACKET_SIZE = 2; + public static final String TOP_DEAD_CENTER_MESSAGE = "r"; + public static final int TORQUE_CURVE_SIZE = 6; + public static final int TPS_2_BYTE_PACKING_MULT = 100; + public static final int TPS_TPS_ACCEL_TABLE = 8; + public static final String TRIGGER_COMMENT = "#"; + public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; + public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; + public static final int TRIGGER_INPUT_PIN_COUNT = 2; + public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; + public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final String TRIGGERS_FILE_NAME = "triggers.txt"; + public static final int TRIM_SIZE = 4; + public static final char TS_BURN_COMMAND = 'B'; + public static final char TS_CHUNK_WRITE_COMMAND = 'C'; + public static final char TS_COMMAND_F = 'F'; + public static final int TS_COMPOSITE_DISABLE = 2; + public static final int TS_COMPOSITE_ENABLE = 1; + public static final char TS_CRC_CHECK_COMMAND = 'k'; + public static final char TS_EXECUTE = 'E'; + public static final int TS_FILE_VERSION = 20210312; + public static final int TS_FILE_VERSION_OFFSET = 124; + public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8'; + public static final char TS_GET_CONFIG_ERROR = 'e'; + public static final char TS_GET_FIRMWARE_VERSION = 'V'; + public static final char TS_GET_LOGGER_GET_BUFFER = 'L'; + public static final char TS_GET_OUTPUTS_SIZE = '4'; + public static final char TS_GET_PROTOCOL_VERSION_COMMAND_F = 'F'; + public static final char TS_GET_TEXT = 'G'; + public static final char TS_HELLO_COMMAND = 'S'; + public static final char TS_IO_TEST_COMMAND = 'Z'; + public static final char TS_ONLINE_PROTOCOL = 'z'; + public static final char TS_OUTPUT_COMMAND = 'O'; + public static final char TS_PAGE_COMMAND = 'P'; + public static final char TS_PERF_TRACE_BEGIN = '_'; + public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; + public static final String TS_PROTOCOL = "001"; + public static final char TS_QUERY_COMMAND = 'Q'; + public static final char TS_READ_COMMAND = 'R'; + public static final int TS_RESPONSE_BURN_OK = 4; + public static final int TS_RESPONSE_COMMAND_OK = 7; + public static final int TS_RESPONSE_CRC_FAILURE = 0x82; + public static final int TS_RESPONSE_FRAMING_ERROR = 0x8D; + public static final int TS_RESPONSE_OK = 0; + public static final int TS_RESPONSE_OUT_OF_RANGE = 0x84; + 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 char TS_SINGLE_WRITE_COMMAND = 'W'; + public static final char TS_TEST_COMMAND = 't'; + public static final int VBAT_INJECTOR_CURVE_SIZE = 8; + public static final int VEHICLE_INFO_SIZE = 32; + public static final int VM_VVT_INACTIVE = 0; + public static final int VR_THRESHOLD_COUNT = 2; + public static final int WWAE_TABLE_SIZE = 8; public static final Field SD_ISTCHARGEAIRMODEL = Field.create("SD_ISTCHARGEAIRMODEL", 0, FieldType.BIT, 0); public static final Field SD_UNUSEDBIT_1_1 = Field.create("SD_UNUSEDBIT_1_1", 0, FieldType.BIT, 1); public static final Field SD_UNUSEDBIT_1_2 = Field.create("SD_UNUSEDBIT_1_2", 0, FieldType.BIT, 2); @@ -68,9 +454,10 @@ public class EngineState { public static final Field TARGETFROMTABLE = Field.create("TARGETFROMTABLE", 112, FieldType.FLOAT); public static final Field SPARKDWELL = Field.create("SPARKDWELL", 116, FieldType.FLOAT); public static final Field DWELLANGLE = Field.create("DWELLANGLE", 120, FieldType.FLOAT); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 124, FieldType.FLOAT); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 128, FieldType.INT16).setScale(1.0); - public static final Field ALIGNMENTFILL_AT_130 = Field.create("ALIGNMENTFILL_AT_130", 130, FieldType.INT8).setScale(1.0); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 124, FieldType.INT16).setScale(0.01); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 126, FieldType.INT16).setScale(0.01); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 128, FieldType.INT16).setScale(0.01); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 130, FieldType.INT16).setScale(1.0); public static final Field[] VALUES = { SD_ISTCHARGEAIRMODEL, SD_UNUSEDBIT_1_1, @@ -135,7 +522,8 @@ public class EngineState { SPARKDWELL, DWELLANGLE, CLTTIMINGCORRECTION, + TIMINGIATCORRECTION, + TIMINGPIDCORRECTION, HELLENBOARDID, - ALIGNMENTFILL_AT_130, }; }