From 479b1e12eb7101c7703c38a9893abfc1dab6999e Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Fri, 14 Feb 2025 13:12:28 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 2 - .../binary/generated/fancy_content.ini | 10 +- .../binary/generated/live_data_fragments.ini | 122 +++++++------- .../console/binary/generated/live_data_ids.h | 10 +- .../console/binary/generated/sensors.java | 104 ++++++------ .../generated/total_live_data_generated.h | 2 +- .../console/binary_log/log_fields_generated.h | 18 +- .../generated/rusefi_generated_alphax-2chan.h | 6 +- .../generated/rusefi_generated_alphax-4chan.h | 6 +- .../rusefi_generated_alphax-4chan_f7.h | 6 +- .../rusefi_generated_alphax-4k-gdi.h | 6 +- .../rusefi_generated_alphax-8chan-revA.h | 6 +- .../generated/rusefi_generated_alphax-8chan.h | 6 +- .../rusefi_generated_alphax-8chan_f7.h | 6 +- .../generated/rusefi_generated_alphax-gold.h | 6 +- .../rusefi_generated_alphax-silver.h | 6 +- .../rusefi_generated_at_start_f435.h | 6 +- .../generated/rusefi_generated_atlas.h | 6 +- .../rusefi_generated_f407-discovery.h | 6 +- .../rusefi_generated_f429-discovery.h | 6 +- .../rusefi_generated_f469-discovery.h | 6 +- .../rusefi_generated_frankenso_na6.h | 6 +- .../generated/rusefi_generated_haba208.h | 6 +- .../rusefi_generated_hellen-honda-k.h | 6 +- .../generated/rusefi_generated_hellen-nb1.h | 6 +- .../rusefi_generated_hellen121nissan.h | 6 +- .../generated/rusefi_generated_hellen121vag.h | 6 +- .../generated/rusefi_generated_hellen128.h | 6 +- .../rusefi_generated_hellen154hyundai.h | 6 +- .../rusefi_generated_hellen154hyundai_f7.h | 6 +- .../generated/rusefi_generated_hellen72.h | 6 +- .../generated/rusefi_generated_hellenNA6.h | 6 +- .../generated/rusefi_generated_hellenNA8_96.h | 6 +- .../generated/rusefi_generated_m74_9.h | 6 +- .../rusefi_generated_mre-legacy_f4.h | 6 +- .../generated/rusefi_generated_mre_f4.h | 6 +- .../generated/rusefi_generated_mre_f7.h | 6 +- .../generated/rusefi_generated_nucleo_f413.h | 6 +- .../generated/rusefi_generated_proteus_f4.h | 6 +- .../generated/rusefi_generated_proteus_f7.h | 6 +- .../generated/rusefi_generated_proteus_h7.h | 6 +- .../rusefi_generated_small-can-board.h | 6 +- .../rusefi_generated_stm32f429_nucleo.h | 6 +- .../rusefi_generated_stm32f767_nucleo.h | 6 +- .../rusefi_generated_stm32h743_nucleo.h | 6 +- .../rusefi_generated_subaru_eg33_f7.h | 6 +- .../generated/rusefi_generated_t-b-g.h | 6 +- .../generated/rusefi_generated_uaefi.h | 6 +- .../generated/rusefi_generated_uaefi121.h | 6 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-4chan_f7.h | 4 +- .../generated/signature_alphax-4k-gdi.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-gold.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-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_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_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.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 +- .../controllers/generated/signature_uaefi.h | 4 +- .../generated/signature_uaefi121.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 5 - .../electronic_throttle_generated.h | 156 +++++++++--------- firmware/tunerstudio/generated/rusefi.ini | 140 ++++++++-------- .../generated/rusefi_alphax-2chan.ini | 140 ++++++++-------- .../generated/rusefi_alphax-4chan.ini | 140 ++++++++-------- .../generated/rusefi_alphax-4chan_f7.ini | 140 ++++++++-------- .../generated/rusefi_alphax-4k-gdi.ini | 140 ++++++++-------- .../generated/rusefi_alphax-8chan-revA.ini | 140 ++++++++-------- .../generated/rusefi_alphax-8chan.ini | 140 ++++++++-------- .../generated/rusefi_alphax-8chan_f7.ini | 140 ++++++++-------- .../generated/rusefi_alphax-gold.ini | 140 ++++++++-------- .../generated/rusefi_alphax-silver.ini | 140 ++++++++-------- .../generated/rusefi_at_start_f435.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_atlas.ini | 140 ++++++++-------- .../generated/rusefi_f407-discovery.ini | 140 ++++++++-------- .../generated/rusefi_f429-discovery.ini | 140 ++++++++-------- .../generated/rusefi_f469-discovery.ini | 140 ++++++++-------- .../generated/rusefi_frankenso_na6.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_haba208.ini | 140 ++++++++-------- .../generated/rusefi_hellen-honda-k.ini | 140 ++++++++-------- .../generated/rusefi_hellen-nb1.ini | 140 ++++++++-------- .../generated/rusefi_hellen121nissan.ini | 140 ++++++++-------- .../generated/rusefi_hellen121vag.ini | 140 ++++++++-------- .../generated/rusefi_hellen128.ini | 140 ++++++++-------- .../generated/rusefi_hellen154hyundai.ini | 140 ++++++++-------- .../generated/rusefi_hellen154hyundai_f7.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_hellen72.ini | 140 ++++++++-------- .../generated/rusefi_hellenNA6.ini | 140 ++++++++-------- .../generated/rusefi_hellenNA8_96.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_m74_9.ini | 140 ++++++++-------- .../generated/rusefi_mre-legacy_f4.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_mre_f4.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_mre_f7.ini | 140 ++++++++-------- .../generated/rusefi_nucleo_f413.ini | 140 ++++++++-------- .../generated/rusefi_proteus_f4.ini | 140 ++++++++-------- .../generated/rusefi_proteus_f7.ini | 140 ++++++++-------- .../generated/rusefi_proteus_h7.ini | 140 ++++++++-------- .../generated/rusefi_small-can-board.ini | 140 ++++++++-------- .../generated/rusefi_stm32f429_nucleo.ini | 140 ++++++++-------- .../generated/rusefi_stm32f767_nucleo.ini | 140 ++++++++-------- .../generated/rusefi_stm32h743_nucleo.ini | 140 ++++++++-------- .../generated/rusefi_subaru_eg33_f7.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_t-b-g.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_uaefi.ini | 140 ++++++++-------- .../tunerstudio/generated/rusefi_uaefi121.ini | 140 ++++++++-------- .../com/rusefi/config/generated/DcMotors.java | 8 +- .../config/generated/ElectronicThrottle.java | 36 ++-- .../com/rusefi/config/generated/Fields.java | 4 +- .../config/generated/LambdaMonitor.java | 8 +- .../rusefi/config/generated/SentState.java | 6 +- .../com/rusefi/config/generated/VvtState.java | 6 +- .../config/generated/WidebandController.java | 16 +- 143 files changed, 3335 insertions(+), 3618 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index ed37b5ad01..29a66bf30b 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -777,7 +777,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -796,7 +795,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index e6e952f4e9..953e21fc63 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -552,16 +552,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -580,16 +579,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/console/binary/generated/live_data_fragments.ini b/firmware/console/binary/generated/live_data_fragments.ini index de6a53b07e..1377d17ba1 100644 --- a/firmware/console/binary/generated/live_data_fragments.ini +++ b/firmware/console/binary/generated/live_data_fragments.ini @@ -857,67 +857,65 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 67a376ba50..54438cc462 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -68,8 +68,8 @@ LDS_lambda_monitor, #define WALL_FUEL_STATE_BASE_ADDRESS 1608 #define IDLE_STATE_BASE_ADDRESS 1616 #define ELECTRONIC_THROTTLE_BASE_ADDRESS 1660 -#define WIDEBAND_STATE_BASE_ADDRESS 1756 -#define DC_MOTORS_BASE_ADDRESS 1780 -#define SENT_STATE_BASE_ADDRESS 1792 -#define VVT_BASE_ADDRESS 1800 -#define LAMBDA_MONITOR_BASE_ADDRESS 1804 +#define WIDEBAND_STATE_BASE_ADDRESS 1748 +#define DC_MOTORS_BASE_ADDRESS 1772 +#define SENT_STATE_BASE_ADDRESS 1784 +#define VVT_BASE_ADDRESS 1792 +#define LAMBDA_MONITOR_BASE_ADDRESS 1796 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 6e219353e0..af30db1e7e 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -604,61 +604,59 @@ trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1664, 1.0, -1.0, luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1668, 1.0, 0.0, 3.0, "%"), m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1672, 1.0, 0.0, 3.0, "%"), etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1676, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1680, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1684, 1.0, -10000.0, 10000.0, "%"), -m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1688, 0.01, -100.0, 100.0, "%"), -alignmentFill_at_30("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1690, 1.0, -20.0, 100.0, "units"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1698, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1700, 1.0, -1.0, -1.0, ""), -etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1701, 1.0, -1.0, -1.0, ""), -tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1703, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1704, 0.01, 0.0, 100.0, "sec"), -adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1706, 1.0, 0.0, 100.0, "%"), -state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1707, 1.0, -1.0, -1.0, ""), +etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1680, 1.0, -10000.0, 10000.0, "%"), +m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1684, 0.01, -100.0, 100.0, "%"), +alignmentFill_at_26("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1686, 1.0, -20.0, 100.0, "units"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1692, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1694, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1696, 1.0, -1.0, -1.0, ""), +etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1697, 1.0, -1.0, -1.0, ""), +tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_39("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1699, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1700, 0.01, 0.0, 100.0, "sec"), +adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, 0.0, 100.0, "%"), +state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1703, 1.0, -1.0, -1.0, ""), targetWithIdlePosition("ETB: target with idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1660, 1.0, 0.0, 10.0, "%"), trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1664, 1.0, -1.0, -1.0, ""), luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1668, 1.0, 0.0, 3.0, "%"), m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1672, 1.0, 0.0, 3.0, "%"), etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1676, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1680, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1684, 1.0, -10000.0, 10000.0, "%"), -m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1688, 0.01, -100.0, 100.0, "%"), -alignmentFill_at_30("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1690, 1.0, -20.0, 100.0, "units"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1696, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1698, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1700, 1.0, -1.0, -1.0, ""), -etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1701, 1.0, -1.0, -1.0, ""), -tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_43("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1703, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1704, 0.01, 0.0, 100.0, "sec"), -adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1706, 1.0, 0.0, 100.0, "%"), -state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1707, 1.0, -1.0, -1.0, ""), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1756, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1757, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1758, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1759, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1760, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1762, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1764, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1766, 1.0, -20.0, 100.0, "units"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1756, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1757, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1758, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1759, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1760, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1762, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1764, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1766, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1780, 1.0, 0.0, 10.0, "%"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1784, 1.0, 0.0, 10.0, "%"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1785, 1.0, -20.0, 100.0, "units"), -value0("SENT ch0 value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1792, 1.0, 0.0, 4095.0, "RAW"), -value1("SENT ch0 value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1794, 1.0, 0.0, 4095.0, "RAW"), -errorRate("SENT ch0 error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1796, 1.0, 0.0, 100.0, "% (don't belive me)"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1800, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1802, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1803, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1808, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1810, 1.0, -20.0, 100.0, "units"), +etbCurrentTarget("ETB: target for current pedal", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1680, 1.0, -10000.0, 10000.0, "%"), +m_adjustedTarget("Adjusted target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1684, 0.01, -100.0, 100.0, "%"), +alignmentFill_at_26("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1686, 1.0, -20.0, 100.0, "units"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1692, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1694, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1696, 1.0, -1.0, -1.0, ""), +etbErrorCodeBlinker("etbErrorCodeBlinker", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1697, 1.0, -1.0, -1.0, ""), +tcEtbDrop("ETB traction control", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1698, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_39("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1699, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1700, 0.01, 0.0, 100.0, "sec"), +adjustedEtbTarget("ETB with adjustments", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1702, 1.0, 0.0, 100.0, "%"), +state("state", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1703, 1.0, -1.0, -1.0, ""), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1748, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1749, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1750, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1751, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1752, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1754, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1756, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1758, 1.0, -20.0, 100.0, "units"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1748, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1749, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1750, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1751, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1752, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1754, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1756, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1758, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1772, 1.0, 0.0, 10.0, "%"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1776, 1.0, 0.0, 10.0, "%"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1777, 1.0, -20.0, 100.0, "units"), +value0("SENT ch0 value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1784, 1.0, 0.0, 4095.0, "RAW"), +value1("SENT ch0 value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1786, 1.0, 0.0, 4095.0, "RAW"), +errorRate("SENT ch0 error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1788, 1.0, 0.0, 100.0, "% (don't belive me)"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1792, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1794, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1795, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1800, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1802, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index bcce60315a..c084bc6e65 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1812 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1804 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 7aba169b57..5f98dd49e5 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -1009,9 +1009,6 @@ static const LogField fields[] = { #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS {getLiveData(0)->etbFeedForward, "etb1etbFeedForward", "", 0}, #endif -#if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {getLiveData(0)->etbIntegralError, "etb1etbIntegralError", "", 3}, -#endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS {getLiveData(0)->etbCurrentTarget, "etb1ETB: target for current pedal", "%", 3}, #endif @@ -1019,13 +1016,13 @@ static const LogField fields[] = { {getLiveData(0)->m_adjustedTarget, "etb1Adjusted target", "%", 2}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {*getLiveData(0), 32, 0, "etb1etbRevLimitActive", ""}, + {*getLiveData(0), 28, 0, "etb1etbRevLimitActive", ""}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {*getLiveData(0), 32, 1, "etb1jamDetected", ""}, + {*getLiveData(0), 28, 1, "etb1jamDetected", ""}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {*getLiveData(0), 32, 2, "etb1validPlantPosition", ""}, + {*getLiveData(0), 28, 2, "etb1validPlantPosition", ""}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS {getLiveData(0)->etbTpsErrorCounter, "etb1ETB TPS error counter", "count", 0, "ETB more"}, @@ -1066,9 +1063,6 @@ static const LogField fields[] = { #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS {getLiveData(1)->etbFeedForward, "etb2etbFeedForward", "", 0}, #endif -#if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {getLiveData(1)->etbIntegralError, "etb2etbIntegralError", "", 3}, -#endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS {getLiveData(1)->etbCurrentTarget, "etb2ETB: target for current pedal", "%", 3}, #endif @@ -1076,13 +1070,13 @@ static const LogField fields[] = { {getLiveData(1)->m_adjustedTarget, "etb2Adjusted target", "%", 2}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {*getLiveData(1), 32, 0, "etb2etbRevLimitActive", ""}, + {*getLiveData(1), 28, 0, "etb2etbRevLimitActive", ""}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {*getLiveData(1), 32, 1, "etb2jamDetected", ""}, + {*getLiveData(1), 28, 1, "etb2jamDetected", ""}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - {*getLiveData(1), 32, 2, "etb2validPlantPosition", ""}, + {*getLiveData(1), 28, 2, "etb2validPlantPosition", ""}, #endif #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS {getLiveData(1)->etbTpsErrorCounter, "etb2ETB TPS error counter", "count", 0, "ETB more"}, diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 0c3b99fc63..0ce9c22b49 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1378,7 +1378,7 @@ #define show_2chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3846983117 +#define SIGNATURE_HASH 3629900604 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-2chan.3846983117" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-2chan.3629900604" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index b34ef09455..5aebf6d17e 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1379,7 +1379,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2899622468 +#define SIGNATURE_HASH 2445481141 #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" @@ -1851,14 +1851,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan.2899622468" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan.2445481141" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index caa7958725..7bf9f7a68a 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1379,7 +1379,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2899622468 +#define SIGNATURE_HASH 2445481141 #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" @@ -1851,14 +1851,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan_f7.2899622468" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan_f7.2445481141" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "C2/C3 Crank VR" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "E5/E6 Cam VR" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h index 1a741f28d8..53d6e986f5 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3262277714 +#define SIGNATURE_HASH 4284860067 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4k-gdi.3262277714" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4k-gdi.4284860067" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 5d2677832b..ab9176cf8d 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1378,7 +1378,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3551263209 +#define SIGNATURE_HASH 4005320472 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan-revA.3551263209" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan-revA.4005320472" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index 5025f9100d..95c1817dfe 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1376,7 +1376,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2968609069 +#define SIGNATURE_HASH 2380713948 #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" @@ -1848,14 +1848,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan.2968609069" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan.2380713948" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 3f0f978201..b600df72a0 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1376,7 +1376,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2968609069 +#define SIGNATURE_HASH 2380713948 #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" @@ -1848,14 +1848,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan_f7.2968609069" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan_f7.2380713948" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-gold.h b/firmware/controllers/generated/rusefi_generated_alphax-gold.h index 6d0012ea19..22d4373ee7 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-gold.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-gold.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4167121013 +#define SIGNATURE_HASH 3312883332 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-gold.4167121013" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-gold.3312883332" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_alphax-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index 4127ab7269..9a24c01481 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -1377,7 +1377,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3854931443 +#define SIGNATURE_HASH 3637656322 #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" @@ -1849,14 +1849,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-silver.3854931443" +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-silver.3637656322" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 3d25dac066..be32fbf799 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.at_start_f435.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.at_start_f435.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index df6c16fdd4..a1c09b6abc 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1861141495 +#define SIGNATURE_HASH 1408855302 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.atlas.1861141495" +#define TS_SIGNATURE "rusEFI master.2025.02.14.atlas.1408855302" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index d1ae5fa578..0704bdefaa 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1381,7 +1381,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 3394362884 +#define SIGNATURE_HASH 4148588789 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.f407-discovery.3394362884" +#define TS_SIGNATURE "rusEFI master.2025.02.14.f407-discovery.4148588789" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index 71ee062d97..e60013788c 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.f429-discovery.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.f429-discovery.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index 7418eab8a9..16155ca148 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 406720810 +#define SIGNATURE_HASH 623493083 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.f469-discovery.406720810" +#define TS_SIGNATURE "rusEFI master.2025.02.14.f469-discovery.623493083" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index d0328c201a..e830dae221 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1382,7 +1382,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 2087347106 +#define SIGNATURE_HASH 1098763603 #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" @@ -1854,14 +1854,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.frankenso_na6.2087347106" +#define TS_SIGNATURE "rusEFI master.2025.02.14.frankenso_na6.1098763603" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index cb596dcd72..978bda2185 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.haba208.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.haba208.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 245f453be1..791cfa87d7 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2127586767 +#define SIGNATURE_HASH 1137167166 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-honda-k.2127586767" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-honda-k.1137167166" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index c3d3794682..8486dea665 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1381,7 +1381,7 @@ #define show_HellenNB1_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2840576678 +#define SIGNATURE_HASH 2488822871 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-nb1.2840576678" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-nb1.2488822871" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index 61d60e410b..5e935802d6 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1381,7 +1381,7 @@ #define show_Hellen121nissan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4201809209 +#define SIGNATURE_HASH 3345296328 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121nissan.4201809209" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121nissan.3345296328" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index a0edce2fc4..a292e700ef 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1381,7 +1381,7 @@ #define show_Hellen121vag_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2719717246 +#define SIGNATURE_HASH 2668378511 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121vag.2719717246" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121vag.2668378511" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index a0cc2158a5..8a63b16a04 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1381,7 +1381,7 @@ #define show_Hellen128merc_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3346742606 +#define SIGNATURE_HASH 4201419711 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen128.3346742606" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen128.4201419711" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 4912b6d475..9a4db903e7 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3361003185 +#define SIGNATURE_HASH 4114839616 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai.3361003185" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai.4114839616" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index 2b070cb218..483919996e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 990597155 +#define SIGNATURE_HASH 102563538 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai_f7.990597155" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai_f7.102563538" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index cce2b4f37a..432ae77e68 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1381,7 +1381,7 @@ #define show_HellenNB2_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3619813999 +#define SIGNATURE_HASH 3939914910 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen72.3619813999" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen72.3939914910" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 0faa755008..60a000f838 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1381,7 +1381,7 @@ #define show_HellenNA6_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3192714329 +#define SIGNATURE_HASH 2203802280 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA6.3192714329" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA6.2203802280" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 0b7ed91461..6fef44a051 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1382,7 +1382,7 @@ #define show_HellenNB1_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1100396183 +#define SIGNATURE_HASH 2088835174 #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" @@ -1854,14 +1854,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA8_96.1100396183" +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA8_96.2088835174" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 1eda377987..58ea3fec20 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1291473958 +#define SIGNATURE_HASH 1911421655 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.m74_9.1291473958" +#define TS_SIGNATURE "rusEFI master.2025.02.14.m74_9.1911421655" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index 7feeb232e4..f7e9b10f8f 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1379,7 +1379,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1637340794 +#define SIGNATURE_HASH 1551923339 #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" @@ -1851,14 +1851,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.mre-legacy_f4.1637340794" +#define TS_SIGNATURE "rusEFI master.2025.02.14.mre-legacy_f4.1551923339" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index f613ab8812..b4a9737259 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1379,7 +1379,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1637340794 +#define SIGNATURE_HASH 1551923339 #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" @@ -1851,14 +1851,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f4.1637340794" +#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f4.1551923339" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 8054c53daa..20179b1a91 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1379,7 +1379,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1637340794 +#define SIGNATURE_HASH 1551923339 #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" @@ -1851,14 +1851,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f7.1637340794" +#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f7.1551923339" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index f8f291e344..8897a836b6 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.nucleo_f413.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.nucleo_f413.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index 5a0fa27e2c..ca8ee202af 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1191790329 +#define SIGNATURE_HASH 2048845832 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f4.1191790329" +#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f4.2048845832" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index e530ca8380..d534b79993 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1191790329 +#define SIGNATURE_HASH 2048845832 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f7.1191790329" +#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f7.2048845832" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 92c3028065..c724a5ef59 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1191790329 +#define SIGNATURE_HASH 2048845832 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_h7.1191790329" +#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_h7.2048845832" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 5b779b9a6c..18ca25abda 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1980906132 +#define SIGNATURE_HASH 1258656869 #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" @@ -1851,14 +1851,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.small-can-board.1980906132" +#define TS_SIGNATURE "rusEFI master.2025.02.14.small-can-board.1258656869" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 00dbe74915..f51412844e 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f429_nucleo.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f429_nucleo.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index 642e7b9e1f..a40748dcdf 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f767_nucleo.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f767_nucleo.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index 6d4877927c..83ffc9e9b9 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32h743_nucleo.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32h743_nucleo.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index 7f8679a3d6..967a842c20 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 965361837 +#define SIGNATURE_HASH 77459036 #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" @@ -1853,14 +1853,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.subaru_eg33_f7.965361837" +#define TS_SIGNATURE "rusEFI master.2025.02.14.subaru_eg33_f7.77459036" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index 10cceaca38..bd545633f9 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1380,7 +1380,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 719919033 +#define SIGNATURE_HASH 402569544 #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" @@ -1852,14 +1852,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.t-b-g.719919033" +#define TS_SIGNATURE "rusEFI master.2025.02.14.t-b-g.402569544" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 2b35aa1ad5..c57e76fe44 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1374,7 +1374,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1867901973 +#define SIGNATURE_HASH 1380074212 #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" @@ -1847,14 +1847,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi.1867901973" +#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi.1380074212" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/rusefi_generated_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index e1c32525ed..b38b501cce 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -1378,7 +1378,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 861959 +#define SIGNATURE_HASH 1025149430 #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" @@ -1850,14 +1850,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi121.861959" +#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi121.1025149430" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1812 +#define TS_TOTAL_OUTPUT_SIZE 1804 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index ae5f26f0d4..d73b22179c 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 3846983117 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-2chan.3846983117" +#define SIGNATURE_HASH 3629900604 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-2chan.3629900604" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index ba31b9c4f7..41b31e066f 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 2899622468 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan.2899622468" +#define SIGNATURE_HASH 2445481141 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan.2445481141" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 0ca924e9b0..d1d86e9227 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 2899622468 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan_f7.2899622468" +#define SIGNATURE_HASH 2445481141 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4chan_f7.2445481141" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index 26807b3b4f..de0f022ae8 100644 --- a/firmware/controllers/generated/signature_alphax-4k-gdi.h +++ b/firmware/controllers/generated/signature_alphax-4k-gdi.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 3262277714 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4k-gdi.3262277714" +#define SIGNATURE_HASH 4284860067 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-4k-gdi.4284860067" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index 74d803e12a..5876822b28 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 3551263209 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan-revA.3551263209" +#define SIGNATURE_HASH 4005320472 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan-revA.4005320472" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 72a64e4e18..f3cbea2e2e 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 2968609069 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan.2968609069" +#define SIGNATURE_HASH 2380713948 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan.2380713948" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index 8d77b28ee9..85d92bffe2 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 2968609069 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan_f7.2968609069" +#define SIGNATURE_HASH 2380713948 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-8chan_f7.2380713948" diff --git a/firmware/controllers/generated/signature_alphax-gold.h b/firmware/controllers/generated/signature_alphax-gold.h index 585b53759d..49ed1ae1bc 100644 --- a/firmware/controllers/generated/signature_alphax-gold.h +++ b/firmware/controllers/generated/signature_alphax-gold.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 4167121013 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-gold.4167121013" +#define SIGNATURE_HASH 3312883332 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-gold.3312883332" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index 452c640a16..e1a2a7f8ea 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 3854931443 -#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-silver.3854931443" +#define SIGNATURE_HASH 3637656322 +#define TS_SIGNATURE "rusEFI master.2025.02.14.alphax-silver.3637656322" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index 0fffc53126..93036e19e2 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.at_start_f435.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.at_start_f435.402569544" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 054e43f50c..b46eb07ed4 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 1861141495 -#define TS_SIGNATURE "rusEFI master.2025.02.14.atlas.1861141495" +#define SIGNATURE_HASH 1408855302 +#define TS_SIGNATURE "rusEFI master.2025.02.14.atlas.1408855302" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index e0e37a291e..19fab5f8ed 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 3394362884 -#define TS_SIGNATURE "rusEFI master.2025.02.14.f407-discovery.3394362884" +#define SIGNATURE_HASH 4148588789 +#define TS_SIGNATURE "rusEFI master.2025.02.14.f407-discovery.4148588789" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 8ee9f8cde6..b0414afec2 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.f429-discovery.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.f429-discovery.402569544" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index 25a47de95b..67fd3f7432 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 406720810 -#define TS_SIGNATURE "rusEFI master.2025.02.14.f469-discovery.406720810" +#define SIGNATURE_HASH 623493083 +#define TS_SIGNATURE "rusEFI master.2025.02.14.f469-discovery.623493083" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4efd2d5a4b..b95c76e3ef 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 2087347106 -#define TS_SIGNATURE "rusEFI master.2025.02.14.frankenso_na6.2087347106" +#define SIGNATURE_HASH 1098763603 +#define TS_SIGNATURE "rusEFI master.2025.02.14.frankenso_na6.1098763603" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index c7ee53b052..db067b9278 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.haba208.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.haba208.402569544" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 34de0a6e00..599e995285 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 2127586767 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-honda-k.2127586767" +#define SIGNATURE_HASH 1137167166 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-honda-k.1137167166" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d64401b71d..08a489ec3b 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 2840576678 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-nb1.2840576678" +#define SIGNATURE_HASH 2488822871 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen-nb1.2488822871" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index b7ef2598c7..c634df0fff 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 4201809209 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121nissan.4201809209" +#define SIGNATURE_HASH 3345296328 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121nissan.3345296328" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 99da85c00c..8bdd4b91a0 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 2719717246 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121vag.2719717246" +#define SIGNATURE_HASH 2668378511 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen121vag.2668378511" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 7ca692300f..022d81914f 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 3346742606 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen128.3346742606" +#define SIGNATURE_HASH 4201419711 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen128.4201419711" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 12cdae8427..24d1b38586 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 3361003185 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai.3361003185" +#define SIGNATURE_HASH 4114839616 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai.4114839616" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index d231a960fe..072f047e19 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 990597155 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai_f7.990597155" +#define SIGNATURE_HASH 102563538 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen154hyundai_f7.102563538" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index cecdb85463..3e5731faca 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 3619813999 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen72.3619813999" +#define SIGNATURE_HASH 3939914910 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellen72.3939914910" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index c36ec2c366..8f33189770 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 3192714329 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA6.3192714329" +#define SIGNATURE_HASH 2203802280 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA6.2203802280" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index fa69badb68..0436faf1dc 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 1100396183 -#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA8_96.1100396183" +#define SIGNATURE_HASH 2088835174 +#define TS_SIGNATURE "rusEFI master.2025.02.14.hellenNA8_96.2088835174" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 42e2deb40d..e3f11d25da 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 1291473958 -#define TS_SIGNATURE "rusEFI master.2025.02.14.m74_9.1291473958" +#define SIGNATURE_HASH 1911421655 +#define TS_SIGNATURE "rusEFI master.2025.02.14.m74_9.1911421655" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index 8d674d1590..a2227a9ce9 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 1637340794 -#define TS_SIGNATURE "rusEFI master.2025.02.14.mre-legacy_f4.1637340794" +#define SIGNATURE_HASH 1551923339 +#define TS_SIGNATURE "rusEFI master.2025.02.14.mre-legacy_f4.1551923339" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 53e974895c..cce14ba1f9 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 1637340794 -#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f4.1637340794" +#define SIGNATURE_HASH 1551923339 +#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f4.1551923339" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 1c951fb383..ed97cb1430 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 1637340794 -#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f7.1637340794" +#define SIGNATURE_HASH 1551923339 +#define TS_SIGNATURE "rusEFI master.2025.02.14.mre_f7.1551923339" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index c25b8f0aa6..29e734c6b0 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.nucleo_f413.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.nucleo_f413.402569544" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 3504d21125..93eccafb71 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 1191790329 -#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f4.1191790329" +#define SIGNATURE_HASH 2048845832 +#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f4.2048845832" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 70b3f9ad03..e9bf25c8c3 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 1191790329 -#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f7.1191790329" +#define SIGNATURE_HASH 2048845832 +#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_f7.2048845832" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 6354440724..0c51c4fc65 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 1191790329 -#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_h7.1191790329" +#define SIGNATURE_HASH 2048845832 +#define TS_SIGNATURE "rusEFI master.2025.02.14.proteus_h7.2048845832" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 2dd76001d1..9be2fdfbe4 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 1980906132 -#define TS_SIGNATURE "rusEFI master.2025.02.14.small-can-board.1980906132" +#define SIGNATURE_HASH 1258656869 +#define TS_SIGNATURE "rusEFI master.2025.02.14.small-can-board.1258656869" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 0e192c438f..eb1f12a914 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f429_nucleo.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f429_nucleo.402569544" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index e8bcd416d1..d942ae26dd 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f767_nucleo.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32f767_nucleo.402569544" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 084035ebaf..e4e7defc0c 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32h743_nucleo.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.stm32h743_nucleo.402569544" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 58759a6fea..bbb6556e2b 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 965361837 -#define TS_SIGNATURE "rusEFI master.2025.02.14.subaru_eg33_f7.965361837" +#define SIGNATURE_HASH 77459036 +#define TS_SIGNATURE "rusEFI master.2025.02.14.subaru_eg33_f7.77459036" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index ee2afb0723..2bb5ea30b1 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 719919033 -#define TS_SIGNATURE "rusEFI master.2025.02.14.t-b-g.719919033" +#define SIGNATURE_HASH 402569544 +#define TS_SIGNATURE "rusEFI master.2025.02.14.t-b-g.402569544" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index fd1d3f0321..35ae7b1e60 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 1867901973 -#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi.1867901973" +#define SIGNATURE_HASH 1380074212 +#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi.1380074212" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index 815698d82f..db4ac838e0 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 861959 -#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi121.861959" +#define SIGNATURE_HASH 1025149430 +#define TS_SIGNATURE "rusEFI master.2025.02.14.uaefi121.1025149430" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 877d2f6db1..961a8dd845 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1707,11 +1707,6 @@ float getOutputValueByName(const char *name) { case -774593527: return getLiveData(0)->etbFeedForward; #endif -// etbIntegralError -#if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS - case 402010976: - return getLiveData(0)->etbIntegralError; -#endif // etbCurrentTarget #if EFI_PROD_CODE && EFI_ELECTRONIC_THROTTLE_BODY && FULL_SD_LOGS case -349799446: diff --git a/firmware/live_data_generated/electronic_throttle_generated.h b/firmware/live_data_generated/electronic_throttle_generated.h index 1086dd7d4b..0968d64b52 100644 --- a/firmware/live_data_generated/electronic_throttle_generated.h +++ b/firmware/live_data_generated/electronic_throttle_generated.h @@ -32,174 +32,170 @@ struct electronic_throttle_s { * offset 16 */ percent_t etbFeedForward = (percent_t)0; - /** - * offset 20 - */ - float etbIntegralError = (float)0; /** * ETB: target for current pedal * units: % - * offset 24 + * offset 20 */ float etbCurrentTarget = (float)0; /** * Adjusted target * units: % - * offset 28 + * offset 24 */ scaled_channel m_adjustedTarget = (int16_t)0; /** * need 4 byte alignment * units: units - * offset 30 + * offset 26 */ - uint8_t alignmentFill_at_30[2] = {}; + uint8_t alignmentFill_at_26[2] = {}; /** - offset 32 bit 0 */ + offset 28 bit 0 */ bool etbRevLimitActive : 1 {}; /** - offset 32 bit 1 */ + offset 28 bit 1 */ bool jamDetected : 1 {}; /** - offset 32 bit 2 */ + offset 28 bit 2 */ bool validPlantPosition : 1 {}; /** - offset 32 bit 3 */ - bool unusedBit_12_3 : 1 {}; + offset 28 bit 3 */ + bool unusedBit_11_3 : 1 {}; /** - offset 32 bit 4 */ - bool unusedBit_12_4 : 1 {}; + offset 28 bit 4 */ + bool unusedBit_11_4 : 1 {}; /** - offset 32 bit 5 */ - bool unusedBit_12_5 : 1 {}; + offset 28 bit 5 */ + bool unusedBit_11_5 : 1 {}; /** - offset 32 bit 6 */ - bool unusedBit_12_6 : 1 {}; + offset 28 bit 6 */ + bool unusedBit_11_6 : 1 {}; /** - offset 32 bit 7 */ - bool unusedBit_12_7 : 1 {}; + offset 28 bit 7 */ + bool unusedBit_11_7 : 1 {}; /** - offset 32 bit 8 */ - bool unusedBit_12_8 : 1 {}; + offset 28 bit 8 */ + bool unusedBit_11_8 : 1 {}; /** - offset 32 bit 9 */ - bool unusedBit_12_9 : 1 {}; + offset 28 bit 9 */ + bool unusedBit_11_9 : 1 {}; /** - offset 32 bit 10 */ - bool unusedBit_12_10 : 1 {}; + offset 28 bit 10 */ + bool unusedBit_11_10 : 1 {}; /** - offset 32 bit 11 */ - bool unusedBit_12_11 : 1 {}; + offset 28 bit 11 */ + bool unusedBit_11_11 : 1 {}; /** - offset 32 bit 12 */ - bool unusedBit_12_12 : 1 {}; + offset 28 bit 12 */ + bool unusedBit_11_12 : 1 {}; /** - offset 32 bit 13 */ - bool unusedBit_12_13 : 1 {}; + offset 28 bit 13 */ + bool unusedBit_11_13 : 1 {}; /** - offset 32 bit 14 */ - bool unusedBit_12_14 : 1 {}; + offset 28 bit 14 */ + bool unusedBit_11_14 : 1 {}; /** - offset 32 bit 15 */ - bool unusedBit_12_15 : 1 {}; + offset 28 bit 15 */ + bool unusedBit_11_15 : 1 {}; /** - offset 32 bit 16 */ - bool unusedBit_12_16 : 1 {}; + offset 28 bit 16 */ + bool unusedBit_11_16 : 1 {}; /** - offset 32 bit 17 */ - bool unusedBit_12_17 : 1 {}; + offset 28 bit 17 */ + bool unusedBit_11_17 : 1 {}; /** - offset 32 bit 18 */ - bool unusedBit_12_18 : 1 {}; + offset 28 bit 18 */ + bool unusedBit_11_18 : 1 {}; /** - offset 32 bit 19 */ - bool unusedBit_12_19 : 1 {}; + offset 28 bit 19 */ + bool unusedBit_11_19 : 1 {}; /** - offset 32 bit 20 */ - bool unusedBit_12_20 : 1 {}; + offset 28 bit 20 */ + bool unusedBit_11_20 : 1 {}; /** - offset 32 bit 21 */ - bool unusedBit_12_21 : 1 {}; + offset 28 bit 21 */ + bool unusedBit_11_21 : 1 {}; /** - offset 32 bit 22 */ - bool unusedBit_12_22 : 1 {}; + offset 28 bit 22 */ + bool unusedBit_11_22 : 1 {}; /** - offset 32 bit 23 */ - bool unusedBit_12_23 : 1 {}; + offset 28 bit 23 */ + bool unusedBit_11_23 : 1 {}; /** - offset 32 bit 24 */ - bool unusedBit_12_24 : 1 {}; + offset 28 bit 24 */ + bool unusedBit_11_24 : 1 {}; /** - offset 32 bit 25 */ - bool unusedBit_12_25 : 1 {}; + offset 28 bit 25 */ + bool unusedBit_11_25 : 1 {}; /** - offset 32 bit 26 */ - bool unusedBit_12_26 : 1 {}; + offset 28 bit 26 */ + bool unusedBit_11_26 : 1 {}; /** - offset 32 bit 27 */ - bool unusedBit_12_27 : 1 {}; + offset 28 bit 27 */ + bool unusedBit_11_27 : 1 {}; /** - offset 32 bit 28 */ - bool unusedBit_12_28 : 1 {}; + offset 28 bit 28 */ + bool unusedBit_11_28 : 1 {}; /** - offset 32 bit 29 */ - bool unusedBit_12_29 : 1 {}; + offset 28 bit 29 */ + bool unusedBit_11_29 : 1 {}; /** - offset 32 bit 30 */ - bool unusedBit_12_30 : 1 {}; + offset 28 bit 30 */ + bool unusedBit_11_30 : 1 {}; /** - offset 32 bit 31 */ - bool unusedBit_12_31 : 1 {}; + offset 28 bit 31 */ + bool unusedBit_11_31 : 1 {}; /** * "ETB TPS error counter" * units: count - * offset 36 + * offset 32 */ uint16_t etbTpsErrorCounter = (uint16_t)0; /** * "ETB pedal error counter" * units: count - * offset 38 + * offset 34 */ uint16_t etbPpsErrorCounter = (uint16_t)0; /** - * offset 40 + * offset 36 */ int8_t etbErrorCode = (int8_t)0; /** - * offset 41 + * offset 37 */ int8_t etbErrorCodeBlinker = (int8_t)0; /** * ETB traction control * units: % - * offset 42 + * offset 38 */ int8_t tcEtbDrop = (int8_t)0; /** * need 4 byte alignment * units: units - * offset 43 + * offset 39 */ - uint8_t alignmentFill_at_43[1] = {}; + uint8_t alignmentFill_at_39[1] = {}; /** * ETB jam timer * units: sec - * offset 44 + * offset 40 */ scaled_channel jamTimer = (uint16_t)0; /** * ETB with adjustments * units: % - * offset 46 + * offset 42 */ int8_t adjustedEtbTarget = (int8_t)0; /** - * offset 47 + * offset 43 */ uint8_t state = (uint8_t)0; }; -static_assert(sizeof(electronic_throttle_s) == 48); +static_assert(sizeof(electronic_throttle_s) == 44); // end // this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b21e7bc690..dbe873e8b9 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.2025.02.14.f407-discovery.3394362884" + signature = "rusEFI master.2025.02.14.f407-discovery.4148588789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.f407-discovery.3394362884" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.f407-discovery.4148588789" ; 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 @@ -2681,7 +2681,7 @@ communityCommsLedPin = bits, U16, 23292, [0:8], $gpio_list ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3555,70 +3555,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6159,7 +6157,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6178,7 +6175,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7299,16 +7295,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7327,16 +7322,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index e74592f681..059b3ae940 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.2025.02.14.alphax-2chan.3846983117" + signature = "rusEFI master.2025.02.14.alphax-2chan.3629900604" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-2chan.3846983117" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-2chan.3629900604" ; 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 @@ -2685,7 +2685,7 @@ boardUseCamPullDown = bits, U32, 23292, [4:4], "With Pull Up", "With Pull Down" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3559,70 +3559,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6154,7 +6152,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6173,7 +6170,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7278,16 +7274,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7306,16 +7301,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index ce7d78916e..dad2fd9620 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.2025.02.14.alphax-4chan.2899622468" + signature = "rusEFI master.2025.02.14.alphax-4chan.2445481141" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-4chan.2899622468" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-4chan.2445481141" ; 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 @@ -2690,7 +2690,7 @@ boardUseD3PullDown = bits, U32, 23292, [9:9], "With Pull Up", "With Pull Down" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3564,70 +3564,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6168,7 +6166,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6187,7 +6184,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7321,16 +7317,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7349,16 +7344,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 785da4fcf0..afa9fb3b00 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.2025.02.14.alphax-4chan_f7.2899622468" + signature = "rusEFI master.2025.02.14.alphax-4chan_f7.2445481141" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-4chan_f7.2899622468" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-4chan_f7.2445481141" ; 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 @@ -2690,7 +2690,7 @@ boardUseD3PullDown = bits, U32, 23292, [9:9], "With Pull Up", "With Pull Down" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3564,70 +3564,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6168,7 +6166,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6187,7 +6184,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7321,16 +7317,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7349,16 +7344,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index ecd7e5ebf9..9d34c3badc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.02.14.alphax-4k-gdi.3262277714" + signature = "rusEFI master.2025.02.14.alphax-4k-gdi.4284860067" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-4k-gdi.3262277714" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-4k-gdi.4284860067" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 41288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6154,7 +6152,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6173,7 +6170,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7297,16 +7293,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7325,16 +7320,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 95516efcb6..5b638e5e8f 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.2025.02.14.alphax-8chan-revA.3551263209" + signature = "rusEFI master.2025.02.14.alphax-8chan-revA.4005320472" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-8chan-revA.3551263209" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-8chan-revA.4005320472" ; 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 @@ -2685,7 +2685,7 @@ boardUseTachPullUp = bits, U32, 23292, [4:4], "5v", "12v" ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3559,70 +3559,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6162,7 +6160,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6181,7 +6178,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7297,16 +7293,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7325,16 +7320,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index edf073654f..3747687f1a 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.2025.02.14.alphax-8chan.2968609069" + signature = "rusEFI master.2025.02.14.alphax-8chan.2380713948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-8chan.2968609069" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-8chan.2380713948" ; 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 @@ -2694,7 +2694,7 @@ boardUseFlexPullDown = bits, U32, 25308, [10:10], "With Pull Up", "With Pull Dow ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3568,70 +3568,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6170,7 +6168,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6189,7 +6186,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7326,16 +7322,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7354,16 +7349,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 9c795e10de..3029cb814c 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.2025.02.14.alphax-8chan_f7.2968609069" + signature = "rusEFI master.2025.02.14.alphax-8chan_f7.2380713948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-8chan_f7.2968609069" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-8chan_f7.2380713948" ; 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 @@ -2694,7 +2694,7 @@ boardUseFlexPullDown = bits, U32, 25308, [10:10], "With Pull Up", "With Pull Dow ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3568,70 +3568,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6170,7 +6168,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6189,7 +6186,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7326,16 +7322,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7354,16 +7349,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-gold.ini b/firmware/tunerstudio/generated/rusefi_alphax-gold.ini index 6d8e40bdd6..3a2e38b743 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-gold.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-gold.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.02.14.alphax-gold.4167121013" + signature = "rusEFI master.2025.02.14.alphax-gold.3312883332" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-gold.4167121013" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-gold.3312883332" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index 65778d03cb..afacebcb84 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.2025.02.14.alphax-silver.3854931443" + signature = "rusEFI master.2025.02.14.alphax-silver.3637656322" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.alphax-silver.3854931443" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.alphax-silver.3637656322" ; 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 @@ -2681,7 +2681,7 @@ trailingSparkLoadBins = array, U08, 23292, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3555,70 +3555,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6149,7 +6147,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6168,7 +6165,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7274,16 +7270,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7302,16 +7297,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 4fab17ddfd..d5b00f8a07 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.2025.02.14.at_start_f435.719919033" + signature = "rusEFI master.2025.02.14.at_start_f435.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.at_start_f435.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.at_start_f435.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 3923458e1e..2fd6bc2310 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.2025.02.14.atlas.1861141495" + signature = "rusEFI master.2025.02.14.atlas.1408855302" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.atlas.1861141495" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.atlas.1408855302" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 22788, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index b21e7bc690..dbe873e8b9 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.2025.02.14.f407-discovery.3394362884" + signature = "rusEFI master.2025.02.14.f407-discovery.4148588789" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.f407-discovery.3394362884" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.f407-discovery.4148588789" ; 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 @@ -2681,7 +2681,7 @@ communityCommsLedPin = bits, U16, 23292, [0:8], $gpio_list ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3555,70 +3555,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6159,7 +6157,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6178,7 +6175,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7299,16 +7295,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7327,16 +7322,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 56a3dbfd7a..e456db4687 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.2025.02.14.f429-discovery.719919033" + signature = "rusEFI master.2025.02.14.f429-discovery.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.f429-discovery.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.f429-discovery.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index dae2405ef2..50a73656cc 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.2025.02.14.f469-discovery.406720810" + signature = "rusEFI master.2025.02.14.f469-discovery.623493083" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.f469-discovery.406720810" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.f469-discovery.623493083" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 5e65297371..1e43f900fa 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.2025.02.14.frankenso_na6.2087347106" + signature = "rusEFI master.2025.02.14.frankenso_na6.1098763603" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.frankenso_na6.2087347106" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.frankenso_na6.1098763603" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index ace6b063a2..2a141c89a8 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.2025.02.14.haba208.719919033" + signature = "rusEFI master.2025.02.14.haba208.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.haba208.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.haba208.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 38b436197f..e72fba2159 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.2025.02.14.hellen-honda-k.2127586767" + signature = "rusEFI master.2025.02.14.hellen-honda-k.1137167166" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen-honda-k.2127586767" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen-honda-k.1137167166" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -2621,7 +2621,7 @@ unusedConfigPadding = array, U08, 23741, [36], "", 1, 0, 0, 100, 0 ochGetCommand = "O%2o%2c" - ochBlockSize = 1812 + ochBlockSize = 1804 scatteredOchGetCommand = 9 scatteredOffsetArray = highSpeedOffsets @@ -3487,70 +3487,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6012,7 +6010,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6031,7 +6028,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7112,16 +7108,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7140,16 +7135,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 111fd03e4e..7be061672a 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.2025.02.14.hellen-nb1.2840576678" + signature = "rusEFI master.2025.02.14.hellen-nb1.2488822871" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen-nb1.2840576678" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen-nb1.2488822871" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7293,16 +7289,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7321,16 +7316,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index c4d7ba0a43..4d5241d755 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.2025.02.14.hellen121nissan.4201809209" + signature = "rusEFI master.2025.02.14.hellen121nissan.3345296328" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen121nissan.4201809209" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen121nissan.3345296328" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6156,7 +6154,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6175,7 +6172,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7289,16 +7285,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7317,16 +7312,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index bcc024fa47..5cb33653df 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.2025.02.14.hellen121vag.2719717246" + signature = "rusEFI master.2025.02.14.hellen121vag.2668378511" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen121vag.2719717246" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen121vag.2668378511" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6156,7 +6154,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6175,7 +6172,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7291,16 +7287,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7319,16 +7314,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 4b2571cd17..09991e69c0 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.2025.02.14.hellen128.3346742606" + signature = "rusEFI master.2025.02.14.hellen128.4201419711" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen128.3346742606" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen128.4201419711" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7293,16 +7289,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7321,16 +7316,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 1b5f207b0d..4335fdbea6 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.2025.02.14.hellen154hyundai.3361003185" + signature = "rusEFI master.2025.02.14.hellen154hyundai.4114839616" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen154hyundai.3361003185" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen154hyundai.4114839616" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6152,7 +6150,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6171,7 +6168,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7274,16 +7270,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7302,16 +7297,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index 7367c01ccf..a68d92087f 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.2025.02.14.hellen154hyundai_f7.990597155" + signature = "rusEFI master.2025.02.14.hellen154hyundai_f7.102563538" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen154hyundai_f7.990597155" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen154hyundai_f7.102563538" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6152,7 +6150,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6171,7 +6168,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7275,16 +7271,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7303,16 +7298,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 588fdc40e5..ad6ef9b4f2 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.2025.02.14.hellen72.3619813999" + signature = "rusEFI master.2025.02.14.hellen72.3939914910" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellen72.3619813999" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellen72.3939914910" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7293,16 +7289,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7321,16 +7316,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index df642d6b6d..a339ba724f 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.2025.02.14.hellenNA6.3192714329" + signature = "rusEFI master.2025.02.14.hellenNA6.2203802280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellenNA6.3192714329" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellenNA6.2203802280" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7293,16 +7289,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7321,16 +7316,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 4c0c3fad61..4cd88438a5 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.2025.02.14.hellenNA8_96.1100396183" + signature = "rusEFI master.2025.02.14.hellenNA8_96.2088835174" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.hellenNA8_96.1100396183" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.hellenNA8_96.2088835174" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7293,16 +7289,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7321,16 +7316,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 373f35f29f..99a6ec4732 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.2025.02.14.m74_9.1291473958" + signature = "rusEFI master.2025.02.14.m74_9.1911421655" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.m74_9.1291473958" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.m74_9.1911421655" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 22744, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7295,16 +7291,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7323,16 +7318,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index de2614894d..7d03bb4b5f 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.2025.02.14.mre-legacy_f4.1637340794" + signature = "rusEFI master.2025.02.14.mre-legacy_f4.1551923339" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.mre-legacy_f4.1637340794" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.mre-legacy_f4.1551923339" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 25288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6154,7 +6152,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6173,7 +6170,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7307,16 +7303,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7335,16 +7330,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index ff515e9009..c3c76cc333 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.2025.02.14.mre_f4.1637340794" + signature = "rusEFI master.2025.02.14.mre_f4.1551923339" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.mre_f4.1637340794" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.mre_f4.1551923339" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 25288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6154,7 +6152,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6173,7 +6170,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7307,16 +7303,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7335,16 +7330,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 121a3493c1..5721a0e8f9 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.2025.02.14.mre_f7.1637340794" + signature = "rusEFI master.2025.02.14.mre_f7.1551923339" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.mre_f7.1637340794" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.mre_f7.1551923339" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 25288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6154,7 +6152,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6173,7 +6170,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7307,16 +7303,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7335,16 +7330,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 3dfbe49d3f..380611270f 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.2025.02.14.nucleo_f413.719919033" + signature = "rusEFI master.2025.02.14.nucleo_f413.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.nucleo_f413.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.nucleo_f413.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a6eaf4d6e6..ad5e20e2f0 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.2025.02.14.proteus_f4.1191790329" + signature = "rusEFI master.2025.02.14.proteus_f4.2048845832" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.proteus_f4.1191790329" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.proteus_f4.2048845832" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 28788, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6158,7 +6156,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6177,7 +6174,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7320,16 +7316,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7348,16 +7343,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 4692aaaf60..85d02a3ba1 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.2025.02.14.proteus_f7.1191790329" + signature = "rusEFI master.2025.02.14.proteus_f7.2048845832" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.proteus_f7.1191790329" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.proteus_f7.2048845832" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 28788, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6158,7 +6156,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6177,7 +6174,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7320,16 +7316,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7348,16 +7343,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 309a63e258..c8578343ef 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.2025.02.14.proteus_h7.1191790329" + signature = "rusEFI master.2025.02.14.proteus_h7.2048845832" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.proteus_h7.1191790329" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.proteus_h7.2048845832" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 28788, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6158,7 +6156,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6177,7 +6174,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7320,16 +7316,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7348,16 +7343,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index a4938284fb..d1c512bfe9 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.2025.02.14.small-can-board.1980906132" + signature = "rusEFI master.2025.02.14.small-can-board.1258656869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.small-can-board.1980906132" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.small-can-board.1258656869" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index de0ba8ad26..ef3800cd6d 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.2025.02.14.stm32f429_nucleo.719919033" + signature = "rusEFI master.2025.02.14.stm32f429_nucleo.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.stm32f429_nucleo.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.stm32f429_nucleo.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 52b55eec27..297888a406 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.2025.02.14.stm32f767_nucleo.719919033" + signature = "rusEFI master.2025.02.14.stm32f767_nucleo.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.stm32f767_nucleo.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.stm32f767_nucleo.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 3e53d8d9bf..ea373e65ff 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.2025.02.14.stm32h743_nucleo.719919033" + signature = "rusEFI master.2025.02.14.stm32h743_nucleo.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.stm32h743_nucleo.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.stm32h743_nucleo.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 605d10cccf..2d187fc74e 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.2025.02.14.subaru_eg33_f7.965361837" + signature = "rusEFI master.2025.02.14.subaru_eg33_f7.77459036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.subaru_eg33_f7.965361837" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.subaru_eg33_f7.77459036" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 20614, [2], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7294,16 +7290,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7322,16 +7317,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 3251212d09..4fcb8a2a93 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.2025.02.14.t-b-g.719919033" + signature = "rusEFI master.2025.02.14.t-b-g.402569544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.t-b-g.719919033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.t-b-g.402569544" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6157,7 +6155,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6176,7 +6173,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7292,16 +7288,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7320,16 +7315,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index d6726787cf..ee5c06c590 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.2025.02.14.uaefi.1867901973" + signature = "rusEFI master.2025.02.14.uaefi.1380074212" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.uaefi.1867901973" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.uaefi.1380074212" ; 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 @@ -2683,7 +2683,7 @@ rainTimingPpsBins = array, F32, 23316, [4], "C", 1, 0, -100, 120, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3557,70 +3557,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6169,7 +6167,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6188,7 +6185,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7325,16 +7321,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7353,16 +7348,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index 51a35eb338..5c6275f9b2 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.2025.02.14.uaefi121.861959" + signature = "rusEFI master.2025.02.14.uaefi121.1025149430" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.02.14.uaefi121.861959" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.02.14.uaefi121.1025149430" ; 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 @@ -2680,7 +2680,7 @@ trailingSparkLoadBins = array, U08, 23288, [4], "Load", 5.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1812 + ochBlockSize = 1804 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3554,70 +3554,68 @@ etb1trim = scalar, F32, 1664, "", 1, 0 etb1luaAdjustment = scalar, F32, 1668, "%", 1,0 etb1m_wastegatePosition = scalar, F32, 1672, "%", 1,0 etb1etbFeedForward = scalar, F32, 1676 -etb1etbIntegralError = scalar, F32, 1680, "", 1, 0 -etb1etbCurrentTarget = scalar, F32, 1684, "%", 1, 0 -etb1m_adjustedTarget = scalar, S16, 1688, "%", 0.01, 0 -etb1etbRevLimitActive = bits, U32, 1692, [0:0] -etb1jamDetected = bits, U32, 1692, [1:1] -etb1validPlantPosition = bits, U32, 1692, [2:2] -etb1etbTpsErrorCounter = scalar, U16, 1696, "count", 1,0 -etb1etbPpsErrorCounter = scalar, U16, 1698, "count", 1,0 -etb1etbErrorCode = scalar, S08, 1700, "", 1, 0 -etb1etbErrorCodeBlinker = scalar, S08, 1701, "", 1, 0 -etb1tcEtbDrop = scalar, S08, 1702, "%", 1, 0 -etb1jamTimer = scalar, U16, 1704, "sec", 0.01, 0 -etb1adjustedEtbTarget = scalar, S08, 1706, "%", 1, 0 -etb1state = scalar, U08, 1707, "", 1, 0 -; total TS size = 1708 -etb2targetWithIdlePosition = scalar, F32, 1708, "%", 1,0 -etb2trim = scalar, F32, 1712, "", 1, 0 -etb2luaAdjustment = scalar, F32, 1716, "%", 1,0 -etb2m_wastegatePosition = scalar, F32, 1720, "%", 1,0 -etb2etbFeedForward = scalar, F32, 1724 -etb2etbIntegralError = scalar, F32, 1728, "", 1, 0 -etb2etbCurrentTarget = scalar, F32, 1732, "%", 1, 0 -etb2m_adjustedTarget = scalar, S16, 1736, "%", 0.01, 0 -etb2etbRevLimitActive = bits, U32, 1740, [0:0] -etb2jamDetected = bits, U32, 1740, [1:1] -etb2validPlantPosition = bits, U32, 1740, [2:2] -etb2etbTpsErrorCounter = scalar, U16, 1744, "count", 1,0 -etb2etbPpsErrorCounter = scalar, U16, 1746, "count", 1,0 -etb2etbErrorCode = scalar, S08, 1748, "", 1, 0 -etb2etbErrorCodeBlinker = scalar, S08, 1749, "", 1, 0 -etb2tcEtbDrop = scalar, S08, 1750, "%", 1, 0 -etb2jamTimer = scalar, U16, 1752, "sec", 0.01, 0 -etb2adjustedEtbTarget = scalar, S08, 1754, "%", 1, 0 -etb2state = scalar, U08, 1755, "", 1, 0 -; total TS size = 1756 -wb1faultCode = scalar, U08, 1756, "", 1, 0 -wb1heaterDuty = scalar, U08, 1757, "%", 1, 0 -wb1pumpDuty = scalar, U08, 1758, "%", 1, 0 -wb1tempC = scalar, U16, 1760, "C", 1, 0 -wb1nernstVoltage = scalar, U16, 1762, "V", 0.001, 0 -wb1esr = scalar, U16, 1764, "ohm", 1, 0 -; total TS size = 1768 -wb2faultCode = scalar, U08, 1768, "", 1, 0 -wb2heaterDuty = scalar, U08, 1769, "%", 1, 0 -wb2pumpDuty = scalar, U08, 1770, "%", 1, 0 -wb2tempC = scalar, U16, 1772, "C", 1, 0 -wb2nernstVoltage = scalar, U16, 1774, "V", 0.001, 0 -wb2esr = scalar, U16, 1776, "ohm", 1, 0 -; total TS size = 1780 -dcOutput0 = scalar, F32, 1780, "%", 1,0 -isEnabled0_int = scalar, U08, 1784, "%", 1,0 -isEnabled0 = bits, U32, 1788, [0:0] +etb1etbCurrentTarget = scalar, F32, 1680, "%", 1, 0 +etb1m_adjustedTarget = scalar, S16, 1684, "%", 0.01, 0 +etb1etbRevLimitActive = bits, U32, 1688, [0:0] +etb1jamDetected = bits, U32, 1688, [1:1] +etb1validPlantPosition = bits, U32, 1688, [2:2] +etb1etbTpsErrorCounter = scalar, U16, 1692, "count", 1,0 +etb1etbPpsErrorCounter = scalar, U16, 1694, "count", 1,0 +etb1etbErrorCode = scalar, S08, 1696, "", 1, 0 +etb1etbErrorCodeBlinker = scalar, S08, 1697, "", 1, 0 +etb1tcEtbDrop = scalar, S08, 1698, "%", 1, 0 +etb1jamTimer = scalar, U16, 1700, "sec", 0.01, 0 +etb1adjustedEtbTarget = scalar, S08, 1702, "%", 1, 0 +etb1state = scalar, U08, 1703, "", 1, 0 +; total TS size = 1704 +etb2targetWithIdlePosition = scalar, F32, 1704, "%", 1,0 +etb2trim = scalar, F32, 1708, "", 1, 0 +etb2luaAdjustment = scalar, F32, 1712, "%", 1,0 +etb2m_wastegatePosition = scalar, F32, 1716, "%", 1,0 +etb2etbFeedForward = scalar, F32, 1720 +etb2etbCurrentTarget = scalar, F32, 1724, "%", 1, 0 +etb2m_adjustedTarget = scalar, S16, 1728, "%", 0.01, 0 +etb2etbRevLimitActive = bits, U32, 1732, [0:0] +etb2jamDetected = bits, U32, 1732, [1:1] +etb2validPlantPosition = bits, U32, 1732, [2:2] +etb2etbTpsErrorCounter = scalar, U16, 1736, "count", 1,0 +etb2etbPpsErrorCounter = scalar, U16, 1738, "count", 1,0 +etb2etbErrorCode = scalar, S08, 1740, "", 1, 0 +etb2etbErrorCodeBlinker = scalar, S08, 1741, "", 1, 0 +etb2tcEtbDrop = scalar, S08, 1742, "%", 1, 0 +etb2jamTimer = scalar, U16, 1744, "sec", 0.01, 0 +etb2adjustedEtbTarget = scalar, S08, 1746, "%", 1, 0 +etb2state = scalar, U08, 1747, "", 1, 0 +; total TS size = 1748 +wb1faultCode = scalar, U08, 1748, "", 1, 0 +wb1heaterDuty = scalar, U08, 1749, "%", 1, 0 +wb1pumpDuty = scalar, U08, 1750, "%", 1, 0 +wb1tempC = scalar, U16, 1752, "C", 1, 0 +wb1nernstVoltage = scalar, U16, 1754, "V", 0.001, 0 +wb1esr = scalar, U16, 1756, "ohm", 1, 0 +; total TS size = 1760 +wb2faultCode = scalar, U08, 1760, "", 1, 0 +wb2heaterDuty = scalar, U08, 1761, "%", 1, 0 +wb2pumpDuty = scalar, U08, 1762, "%", 1, 0 +wb2tempC = scalar, U16, 1764, "C", 1, 0 +wb2nernstVoltage = scalar, U16, 1766, "V", 0.001, 0 +wb2esr = scalar, U16, 1768, "ohm", 1, 0 +; total TS size = 1772 +dcOutput0 = scalar, F32, 1772, "%", 1,0 +isEnabled0_int = scalar, U08, 1776, "%", 1,0 +isEnabled0 = bits, U32, 1780, [0:0] +; total TS size = 1784 +value0 = scalar, U16, 1784, "RAW", 1,0 +value1 = scalar, U16, 1786, "RAW", 1,0 +errorRate = scalar, F32, 1788, "% (don't belive me)", 1,0 ; total TS size = 1792 -value0 = scalar, U16, 1792, "RAW", 1,0 -value1 = scalar, U16, 1794, "RAW", 1,0 -errorRate = scalar, F32, 1796, "% (don't belive me)", 1,0 -; total TS size = 1800 -vvtTarget = scalar, U16, 1800, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1802, "%", 0.5, 0 +vvtTarget = scalar, U16, 1792, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1794, "%", 0.5, 0 +; total TS size = 1796 +lambdaCurrentlyGood = bits, U32, 1796, [0:0] +lambdaMonitorCut = bits, U32, 1796, [1:1] +lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 ; total TS size = 1804 -lambdaCurrentlyGood = bits, U32, 1804, [0:0] -lambdaMonitorCut = bits, U32, 1804, [1:1] -lambdaTimeSinceGood = scalar, U16, 1808, "sec", 0.01, 0 -; total TS size = 1812 time = { timeNow } @@ -6158,7 +6156,6 @@ entry = etb1trim, "etb1ETB: trim", float, "%.3f" entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" @@ -6177,7 +6174,6 @@ entry = etb2trim, "etb2ETB: trim", float, "%.3f" entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" @@ -7313,16 +7309,15 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = etb1m_wastegatePosition liveGraph = electronic_throttle0_2_Graph, "Graph", South graphLine = etb1etbFeedForward - graphLine = etb1etbIntegralError graphLine = etb1etbCurrentTarget graphLine = etb1m_adjustedTarget - liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbTpsErrorCounter + liveGraph = electronic_throttle0_3_Graph, "Graph", South graphLine = etb1etbPpsErrorCounter graphLine = etb1etbErrorCode graphLine = etb1etbErrorCodeBlinker - liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1tcEtbDrop + liveGraph = electronic_throttle0_4_Graph, "Graph", South graphLine = etb1jamTimer graphLine = etb1adjustedEtbTarget graphLine = etb1state @@ -7341,16 +7336,15 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1" graphLine = etb2m_wastegatePosition liveGraph = electronic_throttle1_2_Graph, "Graph", South graphLine = etb2etbFeedForward - graphLine = etb2etbIntegralError graphLine = etb2etbCurrentTarget graphLine = etb2m_adjustedTarget - liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbTpsErrorCounter + liveGraph = electronic_throttle1_3_Graph, "Graph", South graphLine = etb2etbPpsErrorCounter graphLine = etb2etbErrorCode graphLine = etb2etbErrorCodeBlinker - liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2tcEtbDrop + liveGraph = electronic_throttle1_4_Graph, "Graph", South graphLine = etb2jamTimer graphLine = etb2adjustedEtbTarget graphLine = etb2state diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 76eb8a5545..cf9c1b3f5c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -181,10 +181,10 @@ public class DcMotors { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1780); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1780); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1780); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1780); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1772); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1772); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1772); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1772); public static final Field[] VALUES = { DCOUTPUT0, ISENABLED0_INT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 70cc10f419..8e1e1007b7 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 @@ -186,32 +186,30 @@ public class ElectronicThrottle { public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1660); public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1660); public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1660); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1660); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1660); - public static final Field M_ADJUSTEDTARGET = Field.create("M_ADJUSTEDTARGET", 28, FieldType.INT16).setScale(0.01).setBaseOffset(1660); - public static final Field ALIGNMENTFILL_AT_30 = Field.create("ALIGNMENTFILL_AT_30", 30, FieldType.INT8).setScale(1.0).setBaseOffset(1660); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1660); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1660); - public static final Field VALIDPLANTPOSITION = Field.create("VALIDPLANTPOSITION", 32, FieldType.BIT, 2).setBaseOffset(1660); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 36, FieldType.INT16).setScale(1.0).setBaseOffset(1660); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 38, FieldType.INT16).setScale(1.0).setBaseOffset(1660); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 40, FieldType.INT8).setScale(1.0).setBaseOffset(1660); - public static final Field ETBERRORCODEBLINKER = Field.create("ETBERRORCODEBLINKER", 41, FieldType.INT8).setScale(1.0).setBaseOffset(1660); - public static final Field TCETBDROP = Field.create("TCETBDROP", 42, FieldType.INT8).setScale(1.0).setBaseOffset(1660); - public static final Field ALIGNMENTFILL_AT_43 = Field.create("ALIGNMENTFILL_AT_43", 43, FieldType.INT8).setScale(1.0).setBaseOffset(1660); - public static final Field JAMTIMER = Field.create("JAMTIMER", 44, FieldType.INT16).setScale(0.01).setBaseOffset(1660); - public static final Field ADJUSTEDETBTARGET = Field.create("ADJUSTEDETBTARGET", 46, FieldType.INT8).setScale(1.0).setBaseOffset(1660); - public static final Field STATE = Field.create("STATE", 47, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1660); + public static final Field M_ADJUSTEDTARGET = Field.create("M_ADJUSTEDTARGET", 24, FieldType.INT16).setScale(0.01).setBaseOffset(1660); + public static final Field ALIGNMENTFILL_AT_26 = Field.create("ALIGNMENTFILL_AT_26", 26, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1660); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 28, FieldType.BIT, 1).setBaseOffset(1660); + public static final Field VALIDPLANTPOSITION = Field.create("VALIDPLANTPOSITION", 28, FieldType.BIT, 2).setBaseOffset(1660); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 32, FieldType.INT16).setScale(1.0).setBaseOffset(1660); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 34, FieldType.INT16).setScale(1.0).setBaseOffset(1660); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field ETBERRORCODEBLINKER = Field.create("ETBERRORCODEBLINKER", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field TCETBDROP = Field.create("TCETBDROP", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field ALIGNMENTFILL_AT_39 = Field.create("ALIGNMENTFILL_AT_39", 39, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field JAMTIMER = Field.create("JAMTIMER", 40, FieldType.INT16).setScale(0.01).setBaseOffset(1660); + public static final Field ADJUSTEDETBTARGET = Field.create("ADJUSTEDETBTARGET", 42, FieldType.INT8).setScale(1.0).setBaseOffset(1660); + public static final Field STATE = Field.create("STATE", 43, FieldType.INT8).setScale(1.0).setBaseOffset(1660); public static final Field[] VALUES = { TARGETWITHIDLEPOSITION, TRIM, LUAADJUSTMENT, M_WASTEGATEPOSITION, ETBFEEDFORWARD, - ETBINTEGRALERROR, ETBCURRENTTARGET, M_ADJUSTEDTARGET, - ALIGNMENTFILL_AT_30, + ALIGNMENTFILL_AT_26, ETBREVLIMITACTIVE, JAMDETECTED, VALIDPLANTPOSITION, @@ -220,7 +218,7 @@ public class ElectronicThrottle { ETBERRORCODE, ETBERRORCODEBLINKER, TCETBDROP, - ALIGNMENTFILL_AT_43, + ALIGNMENTFILL_AT_39, JAMTIMER, ADJUSTEDETBTARGET, STATE, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index f02ef0f43f..c58dff8deb 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 @@ -1554,11 +1554,11 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2025.02.14.f407-discovery.3394362884"; + public static final String TS_SIGNATURE = "rusEFI master.2025.02.14.f407-discovery.4148588789"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1812; + public static final int TS_TOTAL_OUTPUT_SIZE = 1804; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java index 61de0fa04b..cd47f2f4e0 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -6,10 +6,10 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class LambdaMonitor { - public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1804); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1804); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1804); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1804); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1796); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1796); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1796); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1796); public static final Field[] VALUES = { LAMBDACURRENTLYGOOD, LAMBDAMONITORCUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java index 82e782cb66..ad32cc5639 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java @@ -181,9 +181,9 @@ public class SentState { public static final int TCU_GEAR_COUNT = 10; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1792); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1792); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1792); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1784); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1784); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1784); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index 28e6f4559e..0f10932ebd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java @@ -6,9 +6,9 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class VvtState { - public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1800); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1800); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1800); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1792); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1792); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1792); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index cc65c9b843..eb5bbce0dd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -6,14 +6,14 @@ package com.rusefi.config.generated; import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1756); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1756); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1756); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1756); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1756); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1756); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1756); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1756); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1748); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1748); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1748); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1748); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1748); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,