From 01d2e9dbd5c71c91f549fedfbea8a6cb690047d1 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Tue, 18 Jun 2024 01:51:36 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 8 +++--- .../binary/generated/fancy_content.ini | 4 +-- firmware/console/binary/generated/gauges.ini | 4 +-- .../binary/generated/output_channels.ini | 4 +-- .../console/binary/generated/sensors.java | 8 +++--- .../actuators/electronic_throttle_generated.h | 9 ++++--- .../generated/rusefi_generated_alphax-2chan.h | 4 +-- .../generated/rusefi_generated_alphax-4chan.h | 4 +-- .../rusefi_generated_alphax-4chan_f7.h | 4 +-- .../rusefi_generated_alphax-8chan-revA.h | 4 +-- .../generated/rusefi_generated_alphax-8chan.h | 4 +-- .../rusefi_generated_alphax-8chan_f7.h | 4 +-- .../rusefi_generated_alphax-silver.h | 4 +-- .../rusefi_generated_at_start_f435.h | 4 +-- .../generated/rusefi_generated_atlas.h | 4 +-- .../rusefi_generated_f407-discovery.h | 4 +-- .../rusefi_generated_f429-discovery.h | 4 +-- .../rusefi_generated_f469-discovery.h | 4 +-- .../rusefi_generated_frankenso_na6.h | 4 +-- .../generated/rusefi_generated_haba208.h | 4 +-- .../rusefi_generated_hellen-112-17.h | 4 +-- .../rusefi_generated_hellen-gm-e67.h | 4 +-- .../rusefi_generated_hellen-honda-k.h | 4 +-- .../generated/rusefi_generated_hellen-nb1.h | 4 +-- .../rusefi_generated_hellen121nissan.h | 4 +-- .../generated/rusefi_generated_hellen121vag.h | 4 +-- .../generated/rusefi_generated_hellen128.h | 4 +-- .../rusefi_generated_hellen154hyundai.h | 4 +-- .../rusefi_generated_hellen154hyundai_f7.h | 4 +-- .../generated/rusefi_generated_hellen72.h | 4 +-- .../generated/rusefi_generated_hellen81.h | 4 +-- .../generated/rusefi_generated_hellen88bmw.h | 4 +-- .../generated/rusefi_generated_hellenNA6.h | 4 +-- .../generated/rusefi_generated_hellenNA8_96.h | 4 +-- .../generated/rusefi_generated_m74_9.h | 4 +-- .../rusefi_generated_mre-legacy_f4.h | 4 +-- .../generated/rusefi_generated_mre_f4.h | 4 +-- .../generated/rusefi_generated_mre_f7.h | 4 +-- .../generated/rusefi_generated_nucleo_f413.h | 4 +-- .../rusefi_generated_prometheus_405.h | 4 +-- .../rusefi_generated_prometheus_469.h | 4 +-- .../generated/rusefi_generated_proteus_f4.h | 4 +-- .../generated/rusefi_generated_proteus_f7.h | 4 +-- .../generated/rusefi_generated_proteus_h7.h | 4 +-- .../generated/rusefi_generated_s105.h | 4 +-- .../rusefi_generated_small-can-board.h | 4 +-- .../rusefi_generated_stm32f429_nucleo.h | 4 +-- .../rusefi_generated_stm32f767_nucleo.h | 4 +-- .../rusefi_generated_stm32h743_nucleo.h | 4 +-- .../rusefi_generated_subaru_eg33_f7.h | 4 +-- .../generated/rusefi_generated_t-b-g.h | 4 +-- .../generated/rusefi_generated_tdg-pdm8.h | 4 +-- .../generated/rusefi_generated_uaefi.h | 4 +-- .../generated/rusefi_generated_uaefi121.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.h | 4 +-- .../generated/signature_alphax-4chan_f7.h | 4 +-- .../generated/signature_alphax-8chan-revA.h | 4 +-- .../generated/signature_alphax-8chan.h | 4 +-- .../generated/signature_alphax-8chan_f7.h | 4 +-- .../generated/signature_alphax-silver.h | 4 +-- .../generated/signature_at_start_f435.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../generated/signature_f407-discovery.h | 4 +-- .../generated/signature_f429-discovery.h | 4 +-- .../generated/signature_f469-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../controllers/generated/signature_haba208.h | 4 +-- .../generated/signature_hellen-112-17.h | 4 +-- .../generated/signature_hellen-gm-e67.h | 4 +-- .../generated/signature_hellen-honda-k.h | 4 +-- .../generated/signature_hellen-nb1.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen154hyundai.h | 4 +-- .../generated/signature_hellen154hyundai_f7.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellen81.h | 4 +-- .../generated/signature_hellen88bmw.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellenNA8_96.h | 4 +-- .../controllers/generated/signature_m74_9.h | 4 +-- .../generated/signature_mre-legacy_f4.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_nucleo_f413.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_proteus_h7.h | 4 +-- .../controllers/generated/signature_s105.h | 4 +-- .../generated/signature_small-can-board.h | 4 +-- .../generated/signature_stm32f429_nucleo.h | 4 +-- .../generated/signature_stm32f767_nucleo.h | 4 +-- .../generated/signature_stm32h743_nucleo.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- .../controllers/generated/signature_t-b-g.h | 4 +-- .../generated/signature_tdg-pdm8.h | 4 +-- .../controllers/generated/signature_uaefi.h | 4 +-- .../generated/signature_uaefi121.h | 4 +-- firmware/tunerstudio/generated/rusefi.ini | 26 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 26 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 26 +++++++++---------- .../generated/rusefi_alphax-4chan_f7.ini | 26 +++++++++---------- .../generated/rusefi_alphax-8chan-revA.ini | 26 +++++++++---------- .../generated/rusefi_alphax-8chan.ini | 26 +++++++++---------- .../generated/rusefi_alphax-8chan_f7.ini | 26 +++++++++---------- .../generated/rusefi_alphax-silver.ini | 26 +++++++++---------- .../generated/rusefi_at_start_f435.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 26 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 26 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 26 +++++++++---------- .../generated/rusefi_f469-discovery.ini | 26 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_haba208.ini | 26 +++++++++---------- .../generated/rusefi_hellen-112-17.ini | 26 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 26 +++++++++---------- .../generated/rusefi_hellen-honda-k.ini | 24 ++++++++--------- .../generated/rusefi_hellen-nb1.ini | 26 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 26 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 26 +++++++++---------- .../generated/rusefi_hellen128.ini | 26 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 26 +++++++++---------- .../generated/rusefi_hellen154hyundai_f7.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 26 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 26 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 26 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_m74_9.ini | 26 +++++++++---------- .../generated/rusefi_mre-legacy_f4.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 26 +++++++++---------- .../generated/rusefi_nucleo_f413.ini | 26 +++++++++---------- .../generated/rusefi_prometheus_405.ini | 26 +++++++++---------- .../generated/rusefi_prometheus_469.ini | 26 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 26 +++++++++---------- .../generated/rusefi_proteus_f7.ini | 26 +++++++++---------- .../generated/rusefi_proteus_h7.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_s105.ini | 26 +++++++++---------- .../generated/rusefi_small-can-board.ini | 26 +++++++++---------- .../generated/rusefi_stm32f429_nucleo.ini | 26 +++++++++---------- .../generated/rusefi_stm32f767_nucleo.ini | 26 +++++++++---------- .../generated/rusefi_stm32h743_nucleo.ini | 26 +++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_t-b-g.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_uaefi.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_uaefi121.ini | 26 +++++++++---------- .../config/generated/ElectronicThrottle.java | 6 ++--- .../com/rusefi/config/generated/Fields.java | 5 ++-- 153 files changed, 853 insertions(+), 851 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index e6f9b86205..4d037ecec0 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -711,13 +711,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -728,13 +728,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 94aaf47b47..eaa3354e79 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -497,7 +497,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -523,7 +523,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 48354952cf..3dfc2ea24a 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -25,14 +25,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 9fb91d7a92..86290a0a3d 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -812,7 +812,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -830,7 +830,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index a028a8cd6e..774e265c25 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -591,13 +591,13 @@ targetRpmByClt("Idle: Target RPM base", SensorCategory.SENSOR_INPUTS, FieldType. targetRpmAc("Idle: Target A/C RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1576, 1.0, -1.0, -1.0, ""), iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1580, 1.0, -1.0, -1.0, ""), luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1584, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, 0.0, 10.0, "per"), +targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, 0.0, 10.0, "per"), trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1592, 1.0, -1.0, -1.0, ""), luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1596, 1.0, 0.0, 3.0, "per"), m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1600, 1.0, 0.0, 3.0, "per"), etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1604, 1.0, -1.0, -1.0, ""), etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), +etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1616, 1.0, -10000.0, 10000.0, "%"), etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, 0.0, 25.0, "per"), etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1628, 1.0, -20.0, 50.0, "per"), @@ -606,13 +606,13 @@ etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, Fiel etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1636, 1.0, -1.0, -1.0, ""), tcEtbDrop("tcEtbDrop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1637, 1.0, -1.0, -1.0, ""), jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1638, 0.01, 0.0, 100.0, "sec"), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, 0.0, 10.0, "per"), +targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1588, 1.0, 0.0, 10.0, "per"), trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1592, 1.0, -1.0, -1.0, ""), luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1596, 1.0, 0.0, 3.0, "per"), m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1600, 1.0, 0.0, 3.0, "per"), etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1604, 1.0, -1.0, -1.0, ""), etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1608, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), +etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1612, 1.0, -10000.0, 10000.0, "%"), etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1616, 1.0, -10000.0, 10000.0, "%"), etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1624, 1.0, 0.0, 25.0, "per"), etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1628, 1.0, -20.0, 50.0, "per"), diff --git a/firmware/controllers/actuators/electronic_throttle_generated.h b/firmware/controllers/actuators/electronic_throttle_generated.h index 5e04df4a01..d4b9347e45 100644 --- a/firmware/controllers/actuators/electronic_throttle_generated.h +++ b/firmware/controllers/actuators/electronic_throttle_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Jan 03 20:30:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Jun 18 01:50:01 UTC 2024 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -6,11 +6,11 @@ // start of electronic_throttle_s struct electronic_throttle_s { /** - * "ETB: idlePosition" + * "ETB: target with idle" * units: per * offset 0 */ - float idlePosition = (float)0; + float targetWithIdlePosition = (float)0; /** * "ETB: trim" * offset 4 @@ -37,6 +37,7 @@ struct electronic_throttle_s { */ float etbIntegralError = (float)0; /** + * ETB: target for current pedal * units: % * offset 24 */ @@ -184,4 +185,4 @@ struct electronic_throttle_s { static_assert(sizeof(electronic_throttle_s) == 52); // end -// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Jan 03 20:30:10 UTC 2024 +// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Jun 18 01:50:01 UTC 2024 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index ed9e94455a..759895d0d7 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1273,7 +1273,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2441317565 +#define SIGNATURE_HASH 1390256041 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1666,7 +1666,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-2chan.2441317565" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-2chan.1390256041" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 6723214cda..b878948b7d 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2910756400 +#define SIGNATURE_HASH 1847627044 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan.2910756400" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan.1847627044" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 0d8a37cb61..451d3f8663 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2910756400 +#define SIGNATURE_HASH 1847627044 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan_f7.2910756400" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan_f7.1847627044" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 3128d2aaa5..3c66c32c2a 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1273,7 +1273,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2801033410 +#define SIGNATURE_HASH 1705669590 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1666,7 +1666,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan-revA.2801033410" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan-revA.1705669590" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index dd7fc4cbc3..4b66a2e920 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1273,7 +1273,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2639879826 +#define SIGNATURE_HASH 1577536902 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1666,7 +1666,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan.2639879826" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan.1577536902" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 22b565212e..6bd13d8e82 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1273,7 +1273,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2639879826 +#define SIGNATURE_HASH 1577536902 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1666,7 +1666,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan_f7.2639879826" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan_f7.1577536902" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index 4fdb555444..741fc9fae6 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3551856092 +#define SIGNATURE_HASH 283842248 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-silver.3551856092" +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-silver.283842248" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 143f9fac38..2273dfaff4 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.at_start_f435.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.at_start_f435.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index a7e4f2aaaa..05c0dd0ac0 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1607217085 +#define SIGNATURE_HASH 2626829481 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.atlas.1607217085" +#define TS_SIGNATURE "rusEFI master.2024.06.18.atlas.2626829481" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 923a3ad556..69926ca2a2 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3214540946 +#define SIGNATURE_HASH 2093224838 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.f407-discovery.3214540946" +#define TS_SIGNATURE "rusEFI master.2024.06.18.f407-discovery.2093224838" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index e70636fce9..fe602271f6 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.f429-discovery.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.f429-discovery.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index fedf61ce4b..ac3f71ac42 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 689765728 +#define SIGNATURE_HASH 3930254964 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.f469-discovery.689765728" +#define TS_SIGNATURE "rusEFI master.2024.06.18.f469-discovery.3930254964" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index 1d60880f57..ddfec0bfae 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 1296601064 +#define SIGNATURE_HASH 2383846652 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.frankenso_na6.1296601064" +#define TS_SIGNATURE "rusEFI master.2024.06.18.frankenso_na6.2383846652" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index 4feeea822a..912266f381 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.haba208.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.haba208.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 9ae68280d4..359d0516e7 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2462278519 +#define SIGNATURE_HASH 1369272419 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-112-17.2462278519" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-112-17.1369272419" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index b488701d57..94f0361be6 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3618806859 +#define SIGNATURE_HASH 351047519 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-gm-e67.3618806859" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-gm-e67.351047519" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index cde1948240..8e27778c18 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1273,7 +1273,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2119436243 +#define SIGNATURE_HASH 3171554503 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-honda-k.2119436243" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-honda-k.3171554503" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index 333da94912..0fffd7c1de 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4073917907 +#define SIGNATURE_HASH 831332039 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-nb1.4073917907" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-nb1.831332039" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 1785be5aad..bd99d30841 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1585863000 +#define SIGNATURE_HASH 2648197708 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121nissan.1585863000" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121nissan.2648197708" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 81bac3b6e1..34b8aaf880 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 733144597 +#define SIGNATURE_HASH 3907843329 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121vag.733144597" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121vag.3907843329" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 5ca2396aa1..06fbc62475 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4133081348 +#define SIGNATURE_HASH 889700880 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen128.4133081348" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen128.889700880" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index eede89a986..7a23295442 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3895485316 +#define SIGNATURE_HASH 728658064 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai.3895485316" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai.728658064" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index b1db695d5c..1cc8510bb3 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4159136821 +#define SIGNATURE_HASH 884569889 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai_f7.4159136821" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai_f7.884569889" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index e585fc6175..1b3905db0f 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2603224943 +#define SIGNATURE_HASH 1484004475 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen72.2603224943" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen72.1484004475" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index 2ad66b5dfd..abd2ac8f13 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2119920405 +#define SIGNATURE_HASH 3171252225 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen81.2119920405" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen81.3171252225" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 7aa7ca3c02..1a724ac183 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1769504342 +#define SIGNATURE_HASH 2854645058 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output false -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen88bmw.1769504342" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen88bmw.2854645058" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 39ef095b0f..6d4d9d40de 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2406357011 +#define SIGNATURE_HASH 1278216967 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA6.2406357011" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA6.1278216967" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 86d6872e4b..a5d4536a24 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1276,7 +1276,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1890867933 +#define SIGNATURE_HASH 3018475977 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1669,7 +1669,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA8_96.1890867933" +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA8_96.3018475977" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 29bde00b78..6d44058a2c 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2943468332 +#define SIGNATURE_HASH 1815072824 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.m74_9.2943468332" +#define TS_SIGNATURE "rusEFI master.2024.06.18.m74_9.1815072824" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index 6b96956a57..ddc2d3d940 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 116164284 +#define SIGNATURE_HASH 3316815272 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.mre-legacy_f4.116164284" +#define TS_SIGNATURE "rusEFI master.2024.06.18.mre-legacy_f4.3316815272" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index 8117692f62..8478338f50 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 116164284 +#define SIGNATURE_HASH 3316815272 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f4.116164284" +#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f4.3316815272" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 387cb495f8..634cec09b3 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1275,7 +1275,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 116164284 +#define SIGNATURE_HASH 3316815272 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f7.116164284" +#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f7.3316815272" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index 4234a5c3e1..74489f949d 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.nucleo_f413.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.nucleo_f413.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index 8e9d700a67..0318b881f9 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 727660131 +#define SIGNATURE_HASH 3892389239 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_405.727660131" +#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_405.3892389239" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index 3faeaa6626..0e65defb82 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 727660131 +#define SIGNATURE_HASH 3892389239 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_469.727660131" +#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_469.3892389239" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index 6d624a9230..0d0452a96f 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 4056957393 +#define SIGNATURE_HASH 848188101 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f4.4056957393" +#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f4.848188101" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index b8cc0716a4..bfc898242f 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 4056957393 +#define SIGNATURE_HASH 848188101 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f7.4056957393" +#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f7.848188101" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index e9c941cbde..19218c2545 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 4056957393 +#define SIGNATURE_HASH 848188101 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_h7.4056957393" +#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_h7.848188101" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 6126254e35..ff2a726e09 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2755689265 +#define SIGNATURE_HASH 1730045989 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.s105.2755689265" +#define TS_SIGNATURE "rusEFI master.2024.06.18.s105.1730045989" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index e0930e5aee..8e98d4b9fb 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1275,7 +1275,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 3173439953 +#define SIGNATURE_HASH 2121845445 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1669,7 +1669,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.small-can-board.3173439953" +#define TS_SIGNATURE "rusEFI master.2024.06.18.small-can-board.2121845445" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 0d78cc37e1..3bb1a5f25c 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f429_nucleo.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f429_nucleo.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index b8ec9b6a2b..bc5771cc38 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f767_nucleo.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f767_nucleo.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index 64fdf307b5..c6d2572d4a 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32h743_nucleo.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32h743_nucleo.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index 841337c2ac..66be979525 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1363537856 +#define SIGNATURE_HASH 2451307732 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.subaru_eg33_f7.1363537856" +#define TS_SIGNATURE "rusEFI master.2024.06.18.subaru_eg33_f7.2451307732" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index aa3507d95a..ee88d9f2fa 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 466353139 +#define SIGNATURE_HASH 3633703143 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.t-b-g.466353139" +#define TS_SIGNATURE "rusEFI master.2024.06.18.t-b-g.3633703143" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index 6c1b558d69..2469e5eb37 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 568739707 +#define SIGNATURE_HASH 3803731055 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.tdg-pdm8.568739707" +#define TS_SIGNATURE "rusEFI master.2024.06.18.tdg-pdm8.3803731055" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 2df7993017..7267b40e02 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1275,7 +1275,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_uaefi_presets true -#define SIGNATURE_HASH 1639024328 +#define SIGNATURE_HASH 2733610460 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1668,7 +1668,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi.1639024328" +#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi.2733610460" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index 340773fade..569402a009 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -1274,7 +1274,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1228690113 +#define SIGNATURE_HASH 2321695189 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1667,7 +1667,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi121.1228690113" +#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi121.2321695189" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index ee31e1d2ff..ff62746cbf 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2441317565 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-2chan.2441317565" +#define SIGNATURE_HASH 1390256041 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-2chan.1390256041" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 717e18a7ba..059e0a42d8 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2910756400 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan.2910756400" +#define SIGNATURE_HASH 1847627044 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan.1847627044" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index f45b1e0a75..71d2b83f36 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2910756400 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan_f7.2910756400" +#define SIGNATURE_HASH 1847627044 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-4chan_f7.1847627044" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 673c589193..691c82b9dc 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2801033410 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan-revA.2801033410" +#define SIGNATURE_HASH 1705669590 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan-revA.1705669590" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index f03ea15a80..768129cb29 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2639879826 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan.2639879826" +#define SIGNATURE_HASH 1577536902 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan.1577536902" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 00787e6d53..f99517f64d 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2639879826 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan_f7.2639879826" +#define SIGNATURE_HASH 1577536902 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-8chan_f7.1577536902" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index c179d06d89..765a7c8407 100644 --- a/firmware/controllers/generated/signature_alphax-silver.h +++ b/firmware/controllers/generated/signature_alphax-silver.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3551856092 -#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-silver.3551856092" +#define SIGNATURE_HASH 283842248 +#define TS_SIGNATURE "rusEFI master.2024.06.18.alphax-silver.283842248" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 204b122f43..b035d22b80 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.at_start_f435.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.at_start_f435.3633703143" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 0c53a4d75e..9894b85d19 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1607217085 -#define TS_SIGNATURE "rusEFI master.2024.06.18.atlas.1607217085" +#define SIGNATURE_HASH 2626829481 +#define TS_SIGNATURE "rusEFI master.2024.06.18.atlas.2626829481" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 8d10dab7e4..afa29c1e85 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3214540946 -#define TS_SIGNATURE "rusEFI master.2024.06.18.f407-discovery.3214540946" +#define SIGNATURE_HASH 2093224838 +#define TS_SIGNATURE "rusEFI master.2024.06.18.f407-discovery.2093224838" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 6703cacf73..68a5704c88 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.f429-discovery.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.f429-discovery.3633703143" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index e66e24a7e7..82fe40d782 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 689765728 -#define TS_SIGNATURE "rusEFI master.2024.06.18.f469-discovery.689765728" +#define SIGNATURE_HASH 3930254964 +#define TS_SIGNATURE "rusEFI master.2024.06.18.f469-discovery.3930254964" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 574d07f1fc..277ead3ffb 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1296601064 -#define TS_SIGNATURE "rusEFI master.2024.06.18.frankenso_na6.1296601064" +#define SIGNATURE_HASH 2383846652 +#define TS_SIGNATURE "rusEFI master.2024.06.18.frankenso_na6.2383846652" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index fa16881521..9fba456ebb 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.haba208.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.haba208.3633703143" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 7791fbca5e..5fa2b39964 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2462278519 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-112-17.2462278519" +#define SIGNATURE_HASH 1369272419 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-112-17.1369272419" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index b2863f2b4a..94f3eed520 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3618806859 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-gm-e67.3618806859" +#define SIGNATURE_HASH 351047519 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-gm-e67.351047519" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index a4337f565b..fedb92ee51 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2119436243 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-honda-k.2119436243" +#define SIGNATURE_HASH 3171554503 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-honda-k.3171554503" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index bb374d6e14..88a3db8af3 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4073917907 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-nb1.4073917907" +#define SIGNATURE_HASH 831332039 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen-nb1.831332039" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index ac95be2589..7a9e939fff 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1585863000 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121nissan.1585863000" +#define SIGNATURE_HASH 2648197708 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121nissan.2648197708" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 9fa799985b..f2d481dbfc 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 733144597 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121vag.733144597" +#define SIGNATURE_HASH 3907843329 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen121vag.3907843329" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 8a069f4561..de81c268e7 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4133081348 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen128.4133081348" +#define SIGNATURE_HASH 889700880 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen128.889700880" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a4eeedf4ea..c81ff1d36b 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3895485316 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai.3895485316" +#define SIGNATURE_HASH 728658064 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai.728658064" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index e806dfd680..5a547fba65 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4159136821 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai_f7.4159136821" +#define SIGNATURE_HASH 884569889 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen154hyundai_f7.884569889" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 2b8d4d1e3c..a113c3e529 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2603224943 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen72.2603224943" +#define SIGNATURE_HASH 1484004475 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen72.1484004475" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 4217b92035..1b6bc32dd8 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2119920405 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen81.2119920405" +#define SIGNATURE_HASH 3171252225 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen81.3171252225" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 1c86bda9af..1f3bcfa766 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1769504342 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen88bmw.1769504342" +#define SIGNATURE_HASH 2854645058 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellen88bmw.2854645058" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 79b8f3322b..3f7a7d1039 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2406357011 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA6.2406357011" +#define SIGNATURE_HASH 1278216967 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA6.1278216967" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index e034c937b2..b81c992b39 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1890867933 -#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA8_96.1890867933" +#define SIGNATURE_HASH 3018475977 +#define TS_SIGNATURE "rusEFI master.2024.06.18.hellenNA8_96.3018475977" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 3a32eb6caf..f5915e4892 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2943468332 -#define TS_SIGNATURE "rusEFI master.2024.06.18.m74_9.2943468332" +#define SIGNATURE_HASH 1815072824 +#define TS_SIGNATURE "rusEFI master.2024.06.18.m74_9.1815072824" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 3fb041d253..851adcd59e 100644 --- a/firmware/controllers/generated/signature_mre-legacy_f4.h +++ b/firmware/controllers/generated/signature_mre-legacy_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116164284 -#define TS_SIGNATURE "rusEFI master.2024.06.18.mre-legacy_f4.116164284" +#define SIGNATURE_HASH 3316815272 +#define TS_SIGNATURE "rusEFI master.2024.06.18.mre-legacy_f4.3316815272" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b97063ebb6..b7867e09ff 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116164284 -#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f4.116164284" +#define SIGNATURE_HASH 3316815272 +#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f4.3316815272" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 31c9479b24..d565c141c8 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 116164284 -#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f7.116164284" +#define SIGNATURE_HASH 3316815272 +#define TS_SIGNATURE "rusEFI master.2024.06.18.mre_f7.3316815272" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 82c24ab677..adafa16382 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.nucleo_f413.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.nucleo_f413.3633703143" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 23780d23b4..5767a5a23e 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 727660131 -#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_405.727660131" +#define SIGNATURE_HASH 3892389239 +#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_405.3892389239" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a0bd4c4448..1a21386a1a 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 727660131 -#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_469.727660131" +#define SIGNATURE_HASH 3892389239 +#define TS_SIGNATURE "rusEFI master.2024.06.18.prometheus_469.3892389239" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8df24bccd2..1e18b2bf76 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4056957393 -#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f4.4056957393" +#define SIGNATURE_HASH 848188101 +#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f4.848188101" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 918c7a9349..c9d6b8b294 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4056957393 -#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f7.4056957393" +#define SIGNATURE_HASH 848188101 +#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_f7.848188101" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 63bf1cb8c1..d904a8ee70 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4056957393 -#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_h7.4056957393" +#define SIGNATURE_HASH 848188101 +#define TS_SIGNATURE "rusEFI master.2024.06.18.proteus_h7.848188101" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 11e29fa12e..8ef8748254 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2755689265 -#define TS_SIGNATURE "rusEFI master.2024.06.18.s105.2755689265" +#define SIGNATURE_HASH 1730045989 +#define TS_SIGNATURE "rusEFI master.2024.06.18.s105.1730045989" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index d59c3aaa83..e951c8d7f6 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3173439953 -#define TS_SIGNATURE "rusEFI master.2024.06.18.small-can-board.3173439953" +#define SIGNATURE_HASH 2121845445 +#define TS_SIGNATURE "rusEFI master.2024.06.18.small-can-board.2121845445" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 46c48e4545..a40d9f4ebc 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f429_nucleo.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f429_nucleo.3633703143" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index b99608d422..3867f6cd4a 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f767_nucleo.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32f767_nucleo.3633703143" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 3c677086c1..650451622f 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32h743_nucleo.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.stm32h743_nucleo.3633703143" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index b4d0ff99b3..67d2f72e52 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1363537856 -#define TS_SIGNATURE "rusEFI master.2024.06.18.subaru_eg33_f7.1363537856" +#define SIGNATURE_HASH 2451307732 +#define TS_SIGNATURE "rusEFI master.2024.06.18.subaru_eg33_f7.2451307732" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index c4c6ad54ce..f1b7eef6d4 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 466353139 -#define TS_SIGNATURE "rusEFI master.2024.06.18.t-b-g.466353139" +#define SIGNATURE_HASH 3633703143 +#define TS_SIGNATURE "rusEFI master.2024.06.18.t-b-g.3633703143" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index dce08dea0f..4fa25391f3 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 568739707 -#define TS_SIGNATURE "rusEFI master.2024.06.18.tdg-pdm8.568739707" +#define SIGNATURE_HASH 3803731055 +#define TS_SIGNATURE "rusEFI master.2024.06.18.tdg-pdm8.3803731055" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 036d3a3d3f..bf1767abdf 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1639024328 -#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi.1639024328" +#define SIGNATURE_HASH 2733610460 +#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi.2733610460" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index 09f930d08a..b053dd05fc 100644 --- a/firmware/controllers/generated/signature_uaefi121.h +++ b/firmware/controllers/generated/signature_uaefi121.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1228690113 -#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi121.1228690113" +#define SIGNATURE_HASH 2321695189 +#define TS_SIGNATURE "rusEFI master.2024.06.18.uaefi121.2321695189" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 2da761b666..9e7ac36f0d 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.f407-discovery.3214540946" + signature = "rusEFI master.2024.06.18.f407-discovery.2093224838" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.f407-discovery.3214540946" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.f407-discovery.2093224838" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:35:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:34 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6863,7 +6863,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6889,7 +6889,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 3831729e32..6e33c33b8f 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-2chan.2441317565" + signature = "rusEFI master.2024.06.18.alphax-2chan.1390256041" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-2chan.2441317565" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-2chan.1390256041" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:31 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:57 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6856,7 +6856,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6882,7 +6882,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index cd8a337e94..f144032314 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-4chan.2910756400" + signature = "rusEFI master.2024.06.18.alphax-4chan.1847627044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-4chan.2910756400" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-4chan.1847627044" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:34 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6877,7 +6877,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6903,7 +6903,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 9f3b55a120..cbaca2d0a6 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-4chan_f7.2910756400" + signature = "rusEFI master.2024.06.18.alphax-4chan_f7.1847627044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-4chan_f7.2910756400" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-4chan_f7.1847627044" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:07 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:33 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6877,7 +6877,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6903,7 +6903,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 930f69e473..4548faa457 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-8chan-revA.2801033410" + signature = "rusEFI master.2024.06.18.alphax-8chan-revA.1705669590" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-8chan-revA.2801033410" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-8chan-revA.1705669590" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:57 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:23 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6859,7 +6859,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6885,7 +6885,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 3236dc5a6f..5da81f8145 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-8chan.2639879826" + signature = "rusEFI master.2024.06.18.alphax-8chan.1577536902" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-8chan.2639879826" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-8chan.1577536902" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:48 UTC 2024 pageSize = 22768 page = 1 @@ -3356,7 +3356,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3374,7 +3374,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4614,14 +4614,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5769,13 +5769,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5786,13 +5786,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6863,7 +6863,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6889,7 +6889,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 8d1e834b74..fd958cf8d9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-8chan_f7.2639879826" + signature = "rusEFI master.2024.06.18.alphax-8chan_f7.1577536902" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-8chan_f7.2639879826" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-8chan_f7.1577536902" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:46 UTC 2024 pageSize = 22768 page = 1 @@ -3356,7 +3356,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3374,7 +3374,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4614,14 +4614,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5769,13 +5769,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5786,13 +5786,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6863,7 +6863,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6889,7 +6889,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index b5b970d6fd..217da7672a 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.alphax-silver.3551856092" + signature = "rusEFI master.2024.06.18.alphax-silver.283842248" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.alphax-silver.3551856092" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.alphax-silver.283842248" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:51 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 035649ceb4..7e41b1e1c0 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.at_start_f435.466353139" + signature = "rusEFI master.2024.06.18.at_start_f435.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.at_start_f435.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.at_start_f435.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:48 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:14 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 84e2e10c52..ba2dc959e4 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.atlas.1607217085" + signature = "rusEFI master.2024.06.18.atlas.2626829481" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.atlas.1607217085" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.atlas.2626829481" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:07 UTC 2024 pageSize = 22252 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index da719df9c9..e86a5e2635 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.f407-discovery.3214540946" + signature = "rusEFI master.2024.06.18.f407-discovery.2093224838" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.f407-discovery.3214540946" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.f407-discovery.2093224838" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:35:02 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:28 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6863,7 +6863,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6889,7 +6889,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index c40075ab50..a674db6984 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.f429-discovery.466353139" + signature = "rusEFI master.2024.06.18.f429-discovery.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.f429-discovery.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.f429-discovery.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:44 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:10 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index b8c8649688..f5d0464628 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.f469-discovery.689765728" + signature = "rusEFI master.2024.06.18.f469-discovery.3930254964" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.f469-discovery.689765728" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.f469-discovery.3930254964" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:47 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:12 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7036f0eb2f..b712792eb7 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.frankenso_na6.1296601064" + signature = "rusEFI master.2024.06.18.frankenso_na6.2383846652" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.frankenso_na6.1296601064" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.frankenso_na6.2383846652" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:39 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:06 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index ae68950305..ff0c60b932 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.haba208.466353139" + signature = "rusEFI master.2024.06.18.haba208.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.haba208.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.haba208.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:53 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:19 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 1e1c8686e8..47b0550882 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen-112-17.2462278519" + signature = "rusEFI master.2024.06.18.hellen-112-17.1369272419" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen-112-17.2462278519" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen-112-17.1369272419" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:27 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:53 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6856,7 +6856,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6882,7 +6882,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index b50836dd5f..32ca57484f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen-gm-e67.3618806859" + signature = "rusEFI master.2024.06.18.hellen-gm-e67.351047519" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen-gm-e67.3618806859" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen-gm-e67.351047519" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:17 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:43 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 43eb612da5..72474c8552 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2024.06.18.hellen-honda-k.2119436243" + signature = "rusEFI master.2024.06.18.hellen-honda-k.3171554503" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen-honda-k.2119436243" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen-honda-k.3171554503" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -3286,7 +3286,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3304,7 +3304,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4515,14 +4515,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5622,13 +5622,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5639,13 +5639,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6667,7 +6667,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6693,7 +6693,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index af9d87a40e..f18605afe0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen-nb1.4073917907" + signature = "rusEFI master.2024.06.18.hellen-nb1.831332039" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen-nb1.4073917907" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen-nb1.831332039" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:19 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:45 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 03f1a81f17..a16a67290e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen121nissan.1585863000" + signature = "rusEFI master.2024.06.18.hellen121nissan.2648197708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen121nissan.1585863000" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen121nissan.2648197708" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:11 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:37 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6856,7 +6856,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6882,7 +6882,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 1d9b0ed9f3..8ed4391a33 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen121vag.733144597" + signature = "rusEFI master.2024.06.18.hellen121vag.3907843329" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen121vag.733144597" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen121vag.3907843329" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:30 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:56 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index dcc697f30a..2d7aa362bd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen128.4133081348" + signature = "rusEFI master.2024.06.18.hellen128.889700880" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen128.4133081348" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen128.889700880" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:04 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:30 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 62d4713392..ceb0ad6832 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen154hyundai.3895485316" + signature = "rusEFI master.2024.06.18.hellen154hyundai.728658064" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen154hyundai.3895485316" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen154hyundai.728658064" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:16 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:42 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5762,13 +5762,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5779,13 +5779,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6835,7 +6835,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6861,7 +6861,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index eb9f6e1e0e..17f8d14653 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen154hyundai_f7.4159136821" + signature = "rusEFI master.2024.06.18.hellen154hyundai_f7.884569889" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen154hyundai_f7.4159136821" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen154hyundai_f7.884569889" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:09 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:35 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5762,13 +5762,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5779,13 +5779,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6835,7 +6835,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6861,7 +6861,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 25f3b511b1..9dd43b27fd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen72.2603224943" + signature = "rusEFI master.2024.06.18.hellen72.1484004475" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen72.2603224943" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen72.1484004475" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:41 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 1bce5f6c8a..b681526a6b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen81.2119920405" + signature = "rusEFI master.2024.06.18.hellen81.3171252225" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen81.2119920405" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen81.3171252225" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:01 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:27 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6856,7 +6856,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6882,7 +6882,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 8a54649b1d..f8d3c4894c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellen88bmw.1769504342" + signature = "rusEFI master.2024.06.18.hellen88bmw.2854645058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellen88bmw.1769504342" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellen88bmw.2854645058" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:25 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6854,7 +6854,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6880,7 +6880,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 49bfc1ae18..33c4edcb08 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellenNA6.2406357011" + signature = "rusEFI master.2024.06.18.hellenNA6.1278216967" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellenNA6.2406357011" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellenNA6.1278216967" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:25 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:52 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index aba82d3716..b1f9fc741f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.hellenNA8_96.1890867933" + signature = "rusEFI master.2024.06.18.hellenNA8_96.3018475977" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.hellenNA8_96.1890867933" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.hellenNA8_96.3018475977" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:32 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:59 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 0e572e975c..e5fab8a2f8 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.m74_9.2943468332" + signature = "rusEFI master.2024.06.18.m74_9.1815072824" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.m74_9.2943468332" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.m74_9.1815072824" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal PPS1","Pedal position sensor 2 signal PPS2","ETB TPS position sensor 1 signal","ETB TPS position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:45 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:11 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6860,7 +6860,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6886,7 +6886,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index b32bff6317..fdec39cf7a 100644 --- a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.mre-legacy_f4.116164284" + signature = "rusEFI master.2024.06.18.mre-legacy_f4.3316815272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.mre-legacy_f4.116164284" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.mre-legacy_f4.3316815272" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:50 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:16 UTC 2024 pageSize = 24752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5764,13 +5764,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5781,13 +5781,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6868,7 +6868,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6894,7 +6894,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 162de72d53..00cd160cf5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.mre_f4.116164284" + signature = "rusEFI master.2024.06.18.mre_f4.3316815272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.mre_f4.116164284" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.mre_f4.3316815272" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:49 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:15 UTC 2024 pageSize = 24752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5764,13 +5764,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5781,13 +5781,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6868,7 +6868,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6894,7 +6894,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index db00fee3ba..6581cd8bf3 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.mre_f7.116164284" + signature = "rusEFI master.2024.06.18.mre_f7.3316815272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.mre_f7.116164284" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.mre_f7.3316815272" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:52 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:18 UTC 2024 pageSize = 24752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5764,13 +5764,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5781,13 +5781,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6868,7 +6868,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6894,7 +6894,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index cb982b7fe6..ad7944d93a 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.nucleo_f413.466353139" + signature = "rusEFI master.2024.06.18.nucleo_f413.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.nucleo_f413.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.nucleo_f413.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:42 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:08 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e7170b33cd..0ad5060f7d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.prometheus_405.727660131" + signature = "rusEFI master.2024.06.18.prometheus_405.3892389239" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.prometheus_405.727660131" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.prometheus_405.3892389239" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:58 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:24 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6852,7 +6852,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6878,7 +6878,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index c17d1bb53a..f256ffef29 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.prometheus_469.727660131" + signature = "rusEFI master.2024.06.18.prometheus_469.3892389239" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.prometheus_469.727660131" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.prometheus_469.3892389239" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:57 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:23 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6852,7 +6852,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6878,7 +6878,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 433f54dad5..0fb61a6f23 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.proteus_f4.4056957393" + signature = "rusEFI master.2024.06.18.proteus_f4.848188101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.proteus_f4.4056957393" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.proteus_f4.848188101" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:44 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:11 UTC 2024 pageSize = 28252 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6886,7 +6886,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6912,7 +6912,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 1fa641dbe7..deb7af5ae6 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.proteus_f7.4056957393" + signature = "rusEFI master.2024.06.18.proteus_f7.848188101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.proteus_f7.4056957393" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.proteus_f7.848188101" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:43 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:09 UTC 2024 pageSize = 28252 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6886,7 +6886,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6912,7 +6912,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index c41e7de630..cdd8281740 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.proteus_h7.4056957393" + signature = "rusEFI master.2024.06.18.proteus_h7.848188101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.proteus_h7.4056957393" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.proteus_h7.848188101" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:46 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:12 UTC 2024 pageSize = 28252 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6886,7 +6886,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6912,7 +6912,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index b7266a3235..3001d613ba 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.s105.2755689265" + signature = "rusEFI master.2024.06.18.s105.1730045989" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.s105.2755689265" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.s105.1730045989" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:35:01 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:27 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6858,7 +6858,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6884,7 +6884,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 5f56861cb5..136b418235 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.small-can-board.3173439953" + signature = "rusEFI master.2024.06.18.small-can-board.2121845445" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.small-can-board.3173439953" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.small-can-board.2121845445" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:54 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:20 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 892ca136b9..3a7947cf2a 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.stm32f429_nucleo.466353139" + signature = "rusEFI master.2024.06.18.stm32f429_nucleo.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.stm32f429_nucleo.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.stm32f429_nucleo.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:37 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:04 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 4400160fb3..76b2ba8c1f 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.stm32f767_nucleo.466353139" + signature = "rusEFI master.2024.06.18.stm32f767_nucleo.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.stm32f767_nucleo.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.stm32f767_nucleo.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:33:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:06 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 528d31a364..5e78e8b83b 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.stm32h743_nucleo.466353139" + signature = "rusEFI master.2024.06.18.stm32h743_nucleo.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.stm32h743_nucleo.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.stm32h743_nucleo.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:35:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:31 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index d406b9c06e..cf0c57dabe 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.subaru_eg33_f7.1363537856" + signature = "rusEFI master.2024.06.18.subaru_eg33_f7.2451307732" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.subaru_eg33_f7.1363537856" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.subaru_eg33_f7.2451307732" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:02 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6859,7 +6859,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6885,7 +6885,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 6f25e58dad..74e3c0a72e 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.t-b-g.466353139" + signature = "rusEFI master.2024.06.18.t-b-g.3633703143" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.t-b-g.466353139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.t-b-g.3633703143" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:34 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:00 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 573db34d82..ac33493d9c 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.tdg-pdm8.568739707" + signature = "rusEFI master.2024.06.18.tdg-pdm8.3803731055" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.tdg-pdm8.568739707" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.tdg-pdm8.3803731055" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:26 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5766,13 +5766,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5783,13 +5783,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6857,7 +6857,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6883,7 +6883,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index f1a2213670..4389814c36 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.uaefi.1639024328" + signature = "rusEFI master.2024.06.18.uaefi.2733610460" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.uaefi.1639024328" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.uaefi.2733610460" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 Fuel Pressure / AUX3","C14 TPS2","INVALID","D9 MAP","On-board MAP","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:05 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:31 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6877,7 +6877,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6903,7 +6903,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index c1009a1238..26f874a34f 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi121.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi121.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.06.18.uaefi121.1228690113" + signature = "rusEFI master.2024.06.18.uaefi121.2321695189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.06.18.uaefi121.1228690113" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.06.18.uaefi121.2321695189" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:34:03 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:50:29 UTC 2024 pageSize = 22752 page = 1 @@ -3353,7 +3353,7 @@ targetRpmAc = scalar, S32, 1576, "", 1, 0 iacByRpmTaper = scalar, F32, 1580 luaAdd = scalar, F32, 1584 ; total TS size = 1588 -idlePosition0 = scalar, F32, 1588, "per", 1,0 +targetWithIdlePosition0 = scalar, F32, 1588, "per", 1,0 trim0 = scalar, F32, 1592, "", 1, 0 luaAdjustment0 = scalar, F32, 1596, "per", 1,0 m_wastegatePosition0 = scalar, F32, 1600, "per", 1,0 @@ -3371,7 +3371,7 @@ etbErrorCode0 = scalar, S08, 1636, "", 1, 0 tcEtbDrop0 = scalar, S08, 1637, "", 1, 0 jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0 ; total TS size = 1640 -idlePosition1 = scalar, F32, 1640, "per", 1,0 +targetWithIdlePosition1 = scalar, F32, 1640, "per", 1,0 trim1 = scalar, F32, 1644, "", 1, 0 luaAdjustment1 = scalar, F32, 1648, "per", 1,0 m_wastegatePosition1 = scalar, F32, 1652, "per", 1,0 @@ -4611,14 +4611,14 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -idlePosition0Gauge = idlePosition0,"ETB: idlePosition0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 @@ -5767,13 +5767,13 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = idlePosition0, "ETB: idlePosition0", float, "%.3f" +entry = targetWithIdlePosition0, "ETB: target with idle0", float, "%.3f" entry = trim0, "ETB: trim0", float, "%.3f" entry = luaAdjustment0, "ETB: luaAdjustment0", float, "%.3f" entry = m_wastegatePosition0, "DC: wastegatePosition0", float, "%.3f" entry = etbFeedForward0, "etbFeedForward0", float, "%.3f" entry = etbIntegralError0, "etbIntegralError0", float, "%.3f" -entry = etbCurrentTarget0, "etbCurrentTarget0", float, "%.3f" +entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f" entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f" entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d" entry = jamDetected0, "jamDetected0", int, "%d" @@ -5784,13 +5784,13 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f" entry = trim1, "ETB: trim1", float, "%.3f" entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f" entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" entry = jamDetected1, "jamDetected1", int, "%d" @@ -6875,7 +6875,7 @@ indicatorPanel = electronic_throttle0IndicatorPanel, 2 dialog = electronic_throttle0Dialog, "electronic_throttle0" panel = electronic_throttle0IndicatorPanel liveGraph = electronic_throttle0_1_Graph, "Graph", South - graphLine = idlePosition0 + graphLine = targetWithIdlePosition0 graphLine = trim0 graphLine = luaAdjustment0 graphLine = m_wastegatePosition0 @@ -6901,7 +6901,7 @@ indicatorPanel = electronic_throttle1IndicatorPanel, 2 dialog = electronic_throttle1Dialog, "electronic_throttle1" panel = electronic_throttle1IndicatorPanel liveGraph = electronic_throttle1_1_Graph, "Graph", South - graphLine = idlePosition1 + graphLine = targetWithIdlePosition1 graphLine = trim1 graphLine = luaAdjustment1 graphLine = m_wastegatePosition1 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 5ffc2d71b0..9651266d3e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Jun 05 18:56:14 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Jun 18 01:50:01 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -175,7 +175,7 @@ public class ElectronicThrottle { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1588); + public static final Field TARGETWITHIDLEPOSITION = Field.create("TARGETWITHIDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1588); public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1588); public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1588); public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1588); @@ -193,7 +193,7 @@ public class ElectronicThrottle { public static final Field TCETBDROP = Field.create("TCETBDROP", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1588); public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1588); public static final Field[] VALUES = { - IDLEPOSITION, + TARGETWITHIDLEPOSITION, TRIM, LUAADJUSTMENT, M_WASTEGATEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index bead658170..cb0e1a4f18 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Jun 17 23:35:08 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Jun 18 01:51:34 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1197,6 +1197,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; + public static final int SIGNATURE_HASH = 2093224838; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1453,7 +1454,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2024.06.18.f407-discovery.3214540946"; + public static final String TS_SIGNATURE = "rusEFI master.2024.06.18.f407-discovery.2093224838"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't';