From 91cb6148b15286c5a9eb3d5d8aac9ce3a04d9a78 Mon Sep 17 00:00:00 2001 From: GitHub git update Action Date: Sun, 29 Dec 2024 00:36:56 +0000 Subject: [PATCH] Custom Auto-generated Configs [no ci] --- .../console/binary/generated/data_logs.ini | 60 ++++---- .../console/binary_log/log_fields_generated.h | 129 ++++++++++-------- .../generated/rusefi_generated_XYZ.h | 8 +- .../controllers/generated/signature_XYZ.h | 4 +- .../trigger_state_generated.h | 6 +- .../tunerstudio/generated/rusefi_XYZ.ini | 87 ++++++------ .../tunerstudio/generated/signature_XYZ.txt | 2 +- 7 files changed, 156 insertions(+), 140 deletions(-) diff --git a/generated/console/binary/generated/data_logs.ini b/generated/console/binary/generated/data_logs.ini index d46a1a2..2359235 100644 --- a/generated/console/binary/generated/data_logs.ini +++ b/generated/console/binary/generated/data_logs.ini @@ -688,49 +688,49 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter0, "sync: trigger wheel sync counter0", int, "%d" +entry = synchronizationCounter0, "sync: wheel sync counter0", int, "%d" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" -entry = vvtCurrentPosition0, "sync: Primary Cam Position0", float, "%.3f" -entry = vvtToothPosition10, "sync: Cam Tooth Position 10", float, "%.3f" -entry = vvtToothPosition20, "sync: Cam Tooth Position 20", float, "%.3f" -entry = vvtToothPosition30, "sync: Cam Tooth Position 30", float, "%.3f" -entry = vvtToothPosition40, "sync: Cam Tooth Position 40", float, "%.3f" +entry = vvtCurrentPosition0, "sync: Primary Position0", float, "%.3f" +entry = vvtToothPosition10, "sync: Cam Position 10", float, "%.3f" +entry = vvtToothPosition20, "sync: Cam Position 20", float, "%.3f" +entry = vvtToothPosition30, "sync: Cam Position 30", float, "%.3f" +entry = vvtToothPosition40, "sync: Cam Position 40", float, "%.3f" entry = triggerSyncGapRatio0, "Sync: Trigger Latest Ratio0", float, "%.3f" entry = triggerStateIndex0, "triggerStateIndex0", int, "%d" -entry = synchronizationCounter1, "sync: trigger wheel sync counter1", int, "%d" +entry = synchronizationCounter1, "sync: wheel sync counter1", int, "%d" entry = vvtToothDurations01, "vvtToothDurations01", int, "%d" -entry = vvtCurrentPosition1, "sync: Primary Cam Position1", float, "%.3f" -entry = vvtToothPosition11, "sync: Cam Tooth Position 11", float, "%.3f" -entry = vvtToothPosition21, "sync: Cam Tooth Position 21", float, "%.3f" -entry = vvtToothPosition31, "sync: Cam Tooth Position 31", float, "%.3f" -entry = vvtToothPosition41, "sync: Cam Tooth Position 41", float, "%.3f" +entry = vvtCurrentPosition1, "sync: Primary Position1", float, "%.3f" +entry = vvtToothPosition11, "sync: Cam Position 11", float, "%.3f" +entry = vvtToothPosition21, "sync: Cam Position 21", float, "%.3f" +entry = vvtToothPosition31, "sync: Cam Position 31", float, "%.3f" +entry = vvtToothPosition41, "sync: Cam Position 41", float, "%.3f" entry = triggerSyncGapRatio1, "Sync: Trigger Latest Ratio1", float, "%.3f" entry = triggerStateIndex1, "triggerStateIndex1", int, "%d" -entry = synchronizationCounter2, "sync: trigger wheel sync counter2", int, "%d" +entry = synchronizationCounter2, "sync: wheel sync counter2", int, "%d" entry = vvtToothDurations02, "vvtToothDurations02", int, "%d" -entry = vvtCurrentPosition2, "sync: Primary Cam Position2", float, "%.3f" -entry = vvtToothPosition12, "sync: Cam Tooth Position 12", float, "%.3f" -entry = vvtToothPosition22, "sync: Cam Tooth Position 22", float, "%.3f" -entry = vvtToothPosition32, "sync: Cam Tooth Position 32", float, "%.3f" -entry = vvtToothPosition42, "sync: Cam Tooth Position 42", float, "%.3f" +entry = vvtCurrentPosition2, "sync: Primary Position2", float, "%.3f" +entry = vvtToothPosition12, "sync: Cam Position 12", float, "%.3f" +entry = vvtToothPosition22, "sync: Cam Position 22", float, "%.3f" +entry = vvtToothPosition32, "sync: Cam Position 32", float, "%.3f" +entry = vvtToothPosition42, "sync: Cam Position 42", float, "%.3f" entry = triggerSyncGapRatio2, "Sync: Trigger Latest Ratio2", float, "%.3f" entry = triggerStateIndex2, "triggerStateIndex2", int, "%d" -entry = synchronizationCounter3, "sync: trigger wheel sync counter3", int, "%d" +entry = synchronizationCounter3, "sync: wheel sync counter3", int, "%d" entry = vvtToothDurations03, "vvtToothDurations03", int, "%d" -entry = vvtCurrentPosition3, "sync: Primary Cam Position3", float, "%.3f" -entry = vvtToothPosition13, "sync: Cam Tooth Position 13", float, "%.3f" -entry = vvtToothPosition23, "sync: Cam Tooth Position 23", float, "%.3f" -entry = vvtToothPosition33, "sync: Cam Tooth Position 33", float, "%.3f" -entry = vvtToothPosition43, "sync: Cam Tooth Position 43", float, "%.3f" +entry = vvtCurrentPosition3, "sync: Primary Position3", float, "%.3f" +entry = vvtToothPosition13, "sync: Cam Position 13", float, "%.3f" +entry = vvtToothPosition23, "sync: Cam Position 23", float, "%.3f" +entry = vvtToothPosition33, "sync: Cam Position 33", float, "%.3f" +entry = vvtToothPosition43, "sync: Cam Position 43", float, "%.3f" entry = triggerSyncGapRatio3, "Sync: Trigger Latest Ratio3", float, "%.3f" entry = triggerStateIndex3, "triggerStateIndex3", int, "%d" -entry = synchronizationCounter4, "sync: trigger wheel sync counter4", int, "%d" +entry = synchronizationCounter4, "sync: wheel sync counter4", int, "%d" entry = vvtToothDurations04, "vvtToothDurations04", int, "%d" -entry = vvtCurrentPosition4, "sync: Primary Cam Position4", float, "%.3f" -entry = vvtToothPosition14, "sync: Cam Tooth Position 14", float, "%.3f" -entry = vvtToothPosition24, "sync: Cam Tooth Position 24", float, "%.3f" -entry = vvtToothPosition34, "sync: Cam Tooth Position 34", float, "%.3f" -entry = vvtToothPosition44, "sync: Cam Tooth Position 44", float, "%.3f" +entry = vvtCurrentPosition4, "sync: Primary Position4", float, "%.3f" +entry = vvtToothPosition14, "sync: Cam Position 14", float, "%.3f" +entry = vvtToothPosition24, "sync: Cam Position 24", float, "%.3f" +entry = vvtToothPosition34, "sync: Cam Position 34", float, "%.3f" +entry = vvtToothPosition44, "sync: Cam Position 44", float, "%.3f" entry = triggerSyncGapRatio4, "Sync: Trigger Latest Ratio4", float, "%.3f" entry = triggerStateIndex4, "triggerStateIndex4", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" diff --git a/generated/console/binary_log/log_fields_generated.h b/generated/console/binary_log/log_fields_generated.h index 3488e6e..c4f90be 100644 --- a/generated/console/binary_log/log_fields_generated.h +++ b/generated/console/binary_log/log_fields_generated.h @@ -405,77 +405,77 @@ static const LogField fields[] = { {engine->ignitionState.dwellVoltageCorrection, "Ign: Dwell voltage correction", "", 0}, {engine->ignitionState.luaTimingAdd, "Ign: Lua timing add", "deg", 2, "Timing"}, {engine->ignitionState.luaTimingMult, "Ign: Lua timing mult", "deg", 2, "Timing"}, - {___engine.module()->m_knockLevel, "Knock: Current level", "Volts", 2}, - {___engine.module()->m_knockCyl[0], "Knock: Cyl 1", "dBv", 0}, - {___engine.module()->m_knockCyl[1], "Knock: Cyl 2", "dBv", 0}, - {___engine.module()->m_knockCyl[2], "Knock: Cyl 3", "dBv", 0}, - {___engine.module()->m_knockCyl[3], "Knock: Cyl 4", "dBv", 0}, - {___engine.module()->m_knockCyl[4], "Knock: Cyl 5", "dBv", 0}, - {___engine.module()->m_knockCyl[5], "Knock: Cyl 6", "dBv", 0}, - {___engine.module()->m_knockCyl[6], "Knock: Cyl 7", "dBv", 0}, - {___engine.module()->m_knockCyl[7], "Knock: Cyl 8", "dBv", 0}, - {___engine.module()->m_knockCyl[8], "Knock: Cyl 9", "dBv", 0}, - {___engine.module()->m_knockCyl[9], "Knock: Cyl 10", "dBv", 0}, - {___engine.module()->m_knockCyl[10], "Knock: Cyl 11", "dBv", 0}, - {___engine.module()->m_knockCyl[11], "Knock: Cyl 12", "dBv", 0}, - {___engine.module()->m_knockRetard, "Knock: Retard", "deg", 1}, - {___engine.module()->m_knockThreshold, "Knock: Threshold", "", 0}, - {___engine.module()->m_knockCount, "Knock: Count", "", 0}, - {___engine.module()->m_maximumRetard, "Knock: Max retard", "", 0}, - {___engine.module()->m_knockSpectrum[0], "Knock: SpectrumData 1", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[1], "Knock: SpectrumData 2", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[2], "Knock: SpectrumData 3", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[3], "Knock: SpectrumData 4", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[4], "Knock: SpectrumData 5", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[5], "Knock: SpectrumData 6", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[6], "Knock: SpectrumData 7", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[7], "Knock: SpectrumData 8", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[8], "Knock: SpectrumData 9", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[9], "Knock: SpectrumData 10", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[10], "Knock: SpectrumData 11", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[11], "Knock: SpectrumData 12", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[12], "Knock: SpectrumData 13", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[13], "Knock: SpectrumData 14", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[14], "Knock: SpectrumData 15", "compressed data", 0}, - {___engine.module()->m_knockSpectrum[15], "Knock: SpectrumData 16", "compressed data", 0}, - {___engine.module()->m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", "compressed N + N", 0}, - {___engine.module()->m_knockFrequencyStart, "Knock: Start Freq", "Hz", 0}, - {___engine.module()->m_knockFrequencyStep, "Knock: Step Freq", "Hz", 0}, - {___engine.module()->m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", "multiplier", 0}, + {engine->module()->m_knockLevel, "Knock: Current level", "Volts", 2}, + {engine->module()->m_knockCyl[0], "Knock: Cyl 1", "dBv", 0}, + {engine->module()->m_knockCyl[1], "Knock: Cyl 2", "dBv", 0}, + {engine->module()->m_knockCyl[2], "Knock: Cyl 3", "dBv", 0}, + {engine->module()->m_knockCyl[3], "Knock: Cyl 4", "dBv", 0}, + {engine->module()->m_knockCyl[4], "Knock: Cyl 5", "dBv", 0}, + {engine->module()->m_knockCyl[5], "Knock: Cyl 6", "dBv", 0}, + {engine->module()->m_knockCyl[6], "Knock: Cyl 7", "dBv", 0}, + {engine->module()->m_knockCyl[7], "Knock: Cyl 8", "dBv", 0}, + {engine->module()->m_knockCyl[8], "Knock: Cyl 9", "dBv", 0}, + {engine->module()->m_knockCyl[9], "Knock: Cyl 10", "dBv", 0}, + {engine->module()->m_knockCyl[10], "Knock: Cyl 11", "dBv", 0}, + {engine->module()->m_knockCyl[11], "Knock: Cyl 12", "dBv", 0}, + {engine->module()->m_knockRetard, "Knock: Retard", "deg", 1}, + {engine->module()->m_knockThreshold, "Knock: Threshold", "", 0}, + {engine->module()->m_knockCount, "Knock: Count", "", 0}, + {engine->module()->m_maximumRetard, "Knock: Max retard", "", 0}, + {engine->module()->m_knockSpectrum[0], "Knock: SpectrumData 1", "compressed data", 0}, + {engine->module()->m_knockSpectrum[1], "Knock: SpectrumData 2", "compressed data", 0}, + {engine->module()->m_knockSpectrum[2], "Knock: SpectrumData 3", "compressed data", 0}, + {engine->module()->m_knockSpectrum[3], "Knock: SpectrumData 4", "compressed data", 0}, + {engine->module()->m_knockSpectrum[4], "Knock: SpectrumData 5", "compressed data", 0}, + {engine->module()->m_knockSpectrum[5], "Knock: SpectrumData 6", "compressed data", 0}, + {engine->module()->m_knockSpectrum[6], "Knock: SpectrumData 7", "compressed data", 0}, + {engine->module()->m_knockSpectrum[7], "Knock: SpectrumData 8", "compressed data", 0}, + {engine->module()->m_knockSpectrum[8], "Knock: SpectrumData 9", "compressed data", 0}, + {engine->module()->m_knockSpectrum[9], "Knock: SpectrumData 10", "compressed data", 0}, + {engine->module()->m_knockSpectrum[10], "Knock: SpectrumData 11", "compressed data", 0}, + {engine->module()->m_knockSpectrum[11], "Knock: SpectrumData 12", "compressed data", 0}, + {engine->module()->m_knockSpectrum[12], "Knock: SpectrumData 13", "compressed data", 0}, + {engine->module()->m_knockSpectrum[13], "Knock: SpectrumData 14", "compressed data", 0}, + {engine->module()->m_knockSpectrum[14], "Knock: SpectrumData 15", "compressed data", 0}, + {engine->module()->m_knockSpectrum[15], "Knock: SpectrumData 16", "compressed data", 0}, + {engine->module()->m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", "compressed N + N", 0}, + {engine->module()->m_knockFrequencyStart, "Knock: Start Freq", "Hz", 0}, + {engine->module()->m_knockFrequencyStep, "Knock: Step Freq", "Hz", 0}, + {engine->module()->m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", "multiplier", 0}, #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module()->m_deadtime, "Fuel: injector lag", "ms", 3}, + {engine->module()->m_deadtime, "Fuel: injector lag", "ms", 3}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module()->pressureDelta, "Fuel: Injector pressure delta", "kPa", 1}, + {engine->module()->pressureDelta, "Fuel: Injector pressure delta", "kPa", 1}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module()->pressureRatio, "Fuel: Injector pressure ratio", "", 3}, + {engine->module()->pressureRatio, "Fuel: Injector pressure ratio", "", 3}, #endif #if EFI_LAUNCH_CONTROL {engine->launchController.retardThresholdRpm, "retardThresholdRpm", "", 0}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->luaTargetAdd, "Boost: Lua target add", "v", 1, "Boost Control"}, + {engine->module()->luaTargetAdd, "Boost: Lua target add", "v", 1, "Boost Control"}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->boostOutput, "Boost: Output", "percent", 2, "Boost Control"}, + {engine->module()->boostOutput, "Boost: Output", "percent", 2, "Boost Control"}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->luaTargetMult, "Boost: Lua target mult", "v", 1, "Boost Control"}, + {engine->module()->luaTargetMult, "Boost: Lua target mult", "v", 1, "Boost Control"}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->openLoopPart, "Boost: Open loop", "v", 1, "Boost Control"}, + {engine->module()->openLoopPart, "Boost: Open loop", "v", 1, "Boost Control"}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->luaOpenLoopAdd, "Boost: Lua open loop add", "v", 1, "Boost Control"}, + {engine->module()->luaOpenLoopAdd, "Boost: Lua open loop add", "v", 1, "Boost Control"}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->boostControllerClosedLoopPart, "Boost: Closed loop", "%", 1, "Boost Control"}, + {engine->module()->boostControllerClosedLoopPart, "Boost: Closed loop", "%", 1, "Boost Control"}, #endif #if EFI_BOOST_CONTROL - {___engine.module()->boostControlTarget, "Boost: Target", "kPa", 1, "Boost Control"}, + {engine->module()->boostControlTarget, "Boost: Target", "kPa", 1, "Boost Control"}, #endif - {___engine.module()->radiatorFanStatus, "radiatorFanStatus", "", 0}, + {engine->module()->radiatorFanStatus, "radiatorFanStatus", "", 0}, {engine->engineState.lua.fuelAdd, "Lua: Fuel add", "g", 3}, {engine->engineState.lua.fuelMult, "Lua: Fuel mult", "", 0}, {engine->engineState.sd.tCharge, "Air: Charge temperature estimate", "deg C", 1}, @@ -547,42 +547,51 @@ static const LogField fields[] = { #if EFI_SHAFT_POSITION_INPUT {engine->triggerCentral.triggerElapsedUs, "triggerElapsedUs", "", 0}, #endif + {engine->triggerCentral.triggerState.synchronizationCounter, "sync: wheel sync counter", "", 0}, + {engine->triggerCentral.triggerState.vvtToothDurations0, "vvtToothDurations0", "us", 3}, + {engine->triggerCentral.triggerState.vvtCurrentPosition, "sync: Primary Position", "", 3}, + {engine->triggerCentral.triggerState.vvtToothPosition[0], "sync: Cam Position 1", "", 3}, + {engine->triggerCentral.triggerState.vvtToothPosition[1], "sync: Cam Position 2", "", 3}, + {engine->triggerCentral.triggerState.vvtToothPosition[2], "sync: Cam Position 3", "", 3}, + {engine->triggerCentral.triggerState.vvtToothPosition[3], "sync: Cam Position 4", "", 3}, + {engine->triggerCentral.triggerState.triggerSyncGapRatio, "Sync: Trigger Latest Ratio", "", 3}, + {engine->triggerCentral.triggerState.triggerStateIndex, "triggerStateIndex", "", 0}, #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().currentIdlePosition, "Idle: Position", "%", 1}, + {engine->module().unmock().currentIdlePosition, "Idle: Position", "%", 1}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().baseIdlePosition, "idle: base value", "", 0}, + {engine->module().unmock().baseIdlePosition, "idle: base value", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().idleClosedLoop, "Idle: Closed loop", "", 0}, + {engine->module().unmock().idleClosedLoop, "Idle: Closed loop", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().iacByTpsTaper, "idle: iacByTpsTaper portion", "", 0}, + {engine->module().unmock().iacByTpsTaper, "idle: iacByTpsTaper portion", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().idleTarget, "Idle: Target RPM", "", 0}, + {engine->module().unmock().idleTarget, "Idle: Target RPM", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().targetRpmByClt, "Idle: Target RPM base", "", 0}, + {engine->module().unmock().targetRpmByClt, "Idle: Target RPM base", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().targetRpmAc, "Idle: Target A/C RPM", "", 0}, + {engine->module().unmock().targetRpmAc, "Idle: Target A/C RPM", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().iacByRpmTaper, "idle: iacByRpmTaper portion", "", 0}, + {engine->module().unmock().iacByRpmTaper, "idle: iacByRpmTaper portion", "", 0}, #endif #if EFI_PROD_CODE && EFI_IDLE_CONTROL - {___engine.module().unmock().luaAdd, "idle: Lua Adder", "", 0}, + {engine->module().unmock().luaAdd, "idle: Lua Adder", "", 0}, #endif {engine->dc_motors.dcOutput0, "DC: output0", "%", 2, "ETB more"}, {engine->dc_motors.isEnabled0_int, "DC: en0", "%", 2, "ETB more"}, #if EFI_VVT_PID - {___engine.module()->vvtTarget, "vvtTarget", "deg", 1}, + {engine->module()->vvtTarget, "vvtTarget", "deg", 1}, #endif #if EFI_VVT_PID - {___engine.module()->vvtOutput, "vvtOutput", "%", 0}, + {engine->module()->vvtOutput, "vvtOutput", "%", 0}, #endif #if EFI_SHAFT_POSITION_INPUT - {___engine.lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2}, + {engine->lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2}, #endif }; diff --git a/generated/controllers/generated/rusefi_generated_XYZ.h b/generated/controllers/generated/rusefi_generated_XYZ.h index 8794004..322009b 100644 --- a/generated/controllers/generated/rusefi_generated_XYZ.h +++ b/generated/controllers/generated/rusefi_generated_XYZ.h @@ -280,7 +280,7 @@ #define dc_function_e_DC_Wastegate 4 #define dc_io_size 8 #define DC_PER_STEPPER 2 -#define debug_mode_e_auto_enum 0="DBG_0",1="DBG_1",10="DBG_10",11="DBG_11",12="DBG_12",13="DBG_13",16="DBG_16",19="DBG_19",2="DBG_2",20="DBG_20",21="DBG_21",22="DBG_22",24="DBG_24",25="DBG_25",26="DBG_26",27="DBG_27",29="DBG_29",32="DBG_32",34="DBG_34",35="DBG_35",36="DBG_36",37="DBG_37",38="DBG_38",43="DBG_43",46="DBG_46",5="DBG_5",6="DBG_6",7="DBG_7",8="DBG_8",9="DBG_9",40="DBG_COMPOSITE_LOG",33="DBG_DWELL_METRIC",44="DBG_DYNO_VIEW",17="DBG_ELECTRONIC_THROTTLE_PID",4="DBG_EL_ACCEL",39="DBG_ETB_AUTOTUNE",18="DBG_EXECUTOR",30="DBG_ION",15="DBG_KNOCK",45="DBG_LOGIC_ANALYZER",48="DBG_LUA",28="DBG_METRICS",14="DBG_SR5_PROTOCOL",3="DBG_STEPPER_IDLE_CONTROL",47="DBG_TCU",31="DBG_TLE8888",41="DBG_UNUSED41",42="DBG_UNUSED_42",23="UNUSED23" +#define debug_mode_e_auto_enum 0="DBG_0",1="DBG_1",10="DBG_10",11="DBG_11",12="DBG_12",13="DBG_13",16="DBG_16",19="DBG_19",2="DBG_2",20="DBG_20",21="DBG_21",22="DBG_22",24="DBG_24",25="DBG_25",26="DBG_26",27="DBG_27",29="DBG_29",32="DBG_32",33="DBG_33",34="DBG_34",35="DBG_35",36="DBG_36",37="DBG_37",38="DBG_38",43="DBG_43",46="DBG_46",5="DBG_5",6="DBG_6",7="DBG_7",8="DBG_8",9="DBG_9",40="DBG_COMPOSITE_LOG",44="DBG_DYNO_VIEW",17="DBG_ELECTRONIC_THROTTLE_PID",4="DBG_EL_ACCEL",39="DBG_ETB_AUTOTUNE",18="DBG_EXECUTOR",30="DBG_ION",15="DBG_KNOCK",45="DBG_LOGIC_ANALYZER",48="DBG_LUA",28="DBG_METRICS",14="DBG_SR5_PROTOCOL",3="DBG_STEPPER_IDLE_CONTROL",47="DBG_TCU",31="DBG_TLE8888",41="DBG_UNUSED41",42="DBG_UNUSED_42",23="UNUSED23" #define debug_mode_e_DBG_0 0 #define debug_mode_e_DBG_1 1 #define debug_mode_e_DBG_10 10 @@ -299,6 +299,7 @@ #define debug_mode_e_DBG_27 27 #define debug_mode_e_DBG_29 29 #define debug_mode_e_DBG_32 32 +#define debug_mode_e_DBG_33 33 #define debug_mode_e_DBG_34 34 #define debug_mode_e_DBG_35 35 #define debug_mode_e_DBG_36 36 @@ -312,7 +313,6 @@ #define debug_mode_e_DBG_8 8 #define debug_mode_e_DBG_9 9 #define debug_mode_e_DBG_COMPOSITE_LOG 40 -#define debug_mode_e_DBG_DWELL_METRIC 33 #define debug_mode_e_DBG_DYNO_VIEW 44 #define debug_mode_e_DBG_EL_ACCEL 4 #define debug_mode_e_DBG_ELECTRONIC_THROTTLE_PID 17 @@ -1333,7 +1333,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 134363858 +#define SIGNATURE_HASH 67785677 #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" @@ -1801,7 +1801,7 @@ #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 main.2024.12.28.XYZ.134363858" +#define TS_SIGNATURE "rusEFI main.2024.12.29.XYZ.67785677" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/generated/controllers/generated/signature_XYZ.h b/generated/controllers/generated/signature_XYZ.h index 62b96a1..ce5800a 100644 --- a/generated/controllers/generated/signature_XYZ.h +++ b/generated/controllers/generated/signature_XYZ.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 134363858 -#define TS_SIGNATURE "rusEFI main.2024.12.28.XYZ.134363858" +#define SIGNATURE_HASH 67785677 +#define TS_SIGNATURE "rusEFI main.2024.12.29.XYZ.67785677" diff --git a/generated/live_data_generated/trigger_state_generated.h b/generated/live_data_generated/trigger_state_generated.h index 585f34e..a6e6f9f 100644 --- a/generated/live_data_generated/trigger_state_generated.h +++ b/generated/live_data_generated/trigger_state_generated.h @@ -6,7 +6,7 @@ // start of trigger_state_s struct trigger_state_s { /** - * sync: trigger wheel sync counter + * sync: wheel sync counter * offset 0 */ uint32_t synchronizationCounter = (uint32_t)0; @@ -16,12 +16,12 @@ struct trigger_state_s { */ uint32_t vvtToothDurations0 = (uint32_t)0; /** - * "sync: Primary Cam Position" + * "sync: Primary Position" * offset 8 */ float vvtCurrentPosition = (float)0; /** - * "sync: Cam Tooth Position" + * "sync: Cam Position" * offset 12 */ float vvtToothPosition[4]; diff --git a/generated/tunerstudio/generated/rusefi_XYZ.ini b/generated/tunerstudio/generated/rusefi_XYZ.ini index e27a83a..9f9617b 100644 --- a/generated/tunerstudio/generated/rusefi_XYZ.ini +++ b/generated/tunerstudio/generated/rusefi_XYZ.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI main.2024.12.28.XYZ.134363858" + signature = "rusEFI main.2024.12.29.XYZ.67785677" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI main.2024.12.28.XYZ.134363858" ; signature is expected to be 7 or more characters. + signature= "rusEFI main.2024.12.29.XYZ.67785677" ; 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 @@ -3595,7 +3595,9 @@ lambdaTimeSinceGood = scalar, U16, 1800, "sec", 0.01, 0 [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" - pwmAxisLabels = bits, U08, [0:4], "Zero", "TPS %", "MAP kPa", "CLT C", "IAT C", "Fuel Load", "Ignition Load", "Aux Temp 1 C", "Aux Temp 2 C", "Accel Pedal %", "Battery Voltage Volts", "VVT 1 I Deg", "VVT 1 E Deg", "VVT 2 I Deg", "VVT 2 E Deg", "Ethanol (Flex) %", "Aux Linear 1 *", "Aux Linear 2 *", "GPPWM Output 1 %", "GPPWM Output 2 %", "GPPWM Output 3 %", "GPPWM Output 4 %", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure kPa", "EGT 1 C", "EGT 2 C", "INVALID", "INVALID", "INVALID" + pwmAxisLabels = bits, U08, [0:4], "Zero", "TPS %", "MAP kPa", "CLT C", "IAT C", "Fuel Load", "Ignition Load", "Aux Temp 1 C", "Aux Temp 2 C", "Accel Pedal %", "Battery Voltage Volts", "VVT 1 I Deg", "VVT 1 E Deg", "VVT 2 I Deg", "VVT 2 E Deg", "Ethanol (Flex) %", "Aux Linear 1 *", "Aux Linear 2 *", "GPPWM Output 1 %", "GPPWM Output 2 %", "GPPWM Output 3 %", "GPPWM Output 4 %", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure kPa", "EGT 1 C", "EGT 2 C", "INVALID", "INVALID", "INVALID" + veAxisLabels = bits, U08, [0:1], "load", "MAP", "TPS" + targetAfrAxisLabels = bits, U08, [0:2], "load", "MAP", "TPS", "Acc Pedal", "Cyl Filling %" tuneCrcPcVariable = continuousChannelValue, tuneCrc16 @@ -4574,13 +4576,13 @@ curve = rangeMatrix, "Range Switch Input Matrix" zBins = torqueTable table = veTableTbl, veTableMap, "VE Table", 1 - xyLabels = "RPM", "load" + xyLabels = "RPM", {bitStringValue(veAxisLabels, veOverrideMode)} xBins = veRpmBins, RPMValue yBins = veLoadBins, veTableYAxis zBins = veTable -; gridHeight = 2.0 - gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. - upDownLabel = "(RICHER)", "(LEANER)" +; gridHeight = 2.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" table = idleVeTableTbl, idleVeTable, "Idle VE" xyLabels = "RPM", "load" @@ -4761,6 +4763,7 @@ curve = rangeMatrix, "Range Switch Input Matrix" #else table = afrTableTbl, afrTableMap, "Target AFR Table", 1 #endif + xyLabels = "RPM", {bitStringValue(targetAfrAxisLabels, afrOverrideMode)} xBins = lambdaRpmBins, RPMValue yBins = lambdaLoadBins, afrTableYAxis zBins = lambdaTable @@ -6032,49 +6035,49 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter0, "sync: trigger wheel sync counter0", int, "%d" +entry = synchronizationCounter0, "sync: wheel sync counter0", int, "%d" entry = vvtToothDurations00, "vvtToothDurations00", int, "%d" -entry = vvtCurrentPosition0, "sync: Primary Cam Position0", float, "%.3f" -entry = vvtToothPosition10, "sync: Cam Tooth Position 10", float, "%.3f" -entry = vvtToothPosition20, "sync: Cam Tooth Position 20", float, "%.3f" -entry = vvtToothPosition30, "sync: Cam Tooth Position 30", float, "%.3f" -entry = vvtToothPosition40, "sync: Cam Tooth Position 40", float, "%.3f" +entry = vvtCurrentPosition0, "sync: Primary Position0", float, "%.3f" +entry = vvtToothPosition10, "sync: Cam Position 10", float, "%.3f" +entry = vvtToothPosition20, "sync: Cam Position 20", float, "%.3f" +entry = vvtToothPosition30, "sync: Cam Position 30", float, "%.3f" +entry = vvtToothPosition40, "sync: Cam Position 40", float, "%.3f" entry = triggerSyncGapRatio0, "Sync: Trigger Latest Ratio0", float, "%.3f" entry = triggerStateIndex0, "triggerStateIndex0", int, "%d" -entry = synchronizationCounter1, "sync: trigger wheel sync counter1", int, "%d" +entry = synchronizationCounter1, "sync: wheel sync counter1", int, "%d" entry = vvtToothDurations01, "vvtToothDurations01", int, "%d" -entry = vvtCurrentPosition1, "sync: Primary Cam Position1", float, "%.3f" -entry = vvtToothPosition11, "sync: Cam Tooth Position 11", float, "%.3f" -entry = vvtToothPosition21, "sync: Cam Tooth Position 21", float, "%.3f" -entry = vvtToothPosition31, "sync: Cam Tooth Position 31", float, "%.3f" -entry = vvtToothPosition41, "sync: Cam Tooth Position 41", float, "%.3f" +entry = vvtCurrentPosition1, "sync: Primary Position1", float, "%.3f" +entry = vvtToothPosition11, "sync: Cam Position 11", float, "%.3f" +entry = vvtToothPosition21, "sync: Cam Position 21", float, "%.3f" +entry = vvtToothPosition31, "sync: Cam Position 31", float, "%.3f" +entry = vvtToothPosition41, "sync: Cam Position 41", float, "%.3f" entry = triggerSyncGapRatio1, "Sync: Trigger Latest Ratio1", float, "%.3f" entry = triggerStateIndex1, "triggerStateIndex1", int, "%d" -entry = synchronizationCounter2, "sync: trigger wheel sync counter2", int, "%d" +entry = synchronizationCounter2, "sync: wheel sync counter2", int, "%d" entry = vvtToothDurations02, "vvtToothDurations02", int, "%d" -entry = vvtCurrentPosition2, "sync: Primary Cam Position2", float, "%.3f" -entry = vvtToothPosition12, "sync: Cam Tooth Position 12", float, "%.3f" -entry = vvtToothPosition22, "sync: Cam Tooth Position 22", float, "%.3f" -entry = vvtToothPosition32, "sync: Cam Tooth Position 32", float, "%.3f" -entry = vvtToothPosition42, "sync: Cam Tooth Position 42", float, "%.3f" +entry = vvtCurrentPosition2, "sync: Primary Position2", float, "%.3f" +entry = vvtToothPosition12, "sync: Cam Position 12", float, "%.3f" +entry = vvtToothPosition22, "sync: Cam Position 22", float, "%.3f" +entry = vvtToothPosition32, "sync: Cam Position 32", float, "%.3f" +entry = vvtToothPosition42, "sync: Cam Position 42", float, "%.3f" entry = triggerSyncGapRatio2, "Sync: Trigger Latest Ratio2", float, "%.3f" entry = triggerStateIndex2, "triggerStateIndex2", int, "%d" -entry = synchronizationCounter3, "sync: trigger wheel sync counter3", int, "%d" +entry = synchronizationCounter3, "sync: wheel sync counter3", int, "%d" entry = vvtToothDurations03, "vvtToothDurations03", int, "%d" -entry = vvtCurrentPosition3, "sync: Primary Cam Position3", float, "%.3f" -entry = vvtToothPosition13, "sync: Cam Tooth Position 13", float, "%.3f" -entry = vvtToothPosition23, "sync: Cam Tooth Position 23", float, "%.3f" -entry = vvtToothPosition33, "sync: Cam Tooth Position 33", float, "%.3f" -entry = vvtToothPosition43, "sync: Cam Tooth Position 43", float, "%.3f" +entry = vvtCurrentPosition3, "sync: Primary Position3", float, "%.3f" +entry = vvtToothPosition13, "sync: Cam Position 13", float, "%.3f" +entry = vvtToothPosition23, "sync: Cam Position 23", float, "%.3f" +entry = vvtToothPosition33, "sync: Cam Position 33", float, "%.3f" +entry = vvtToothPosition43, "sync: Cam Position 43", float, "%.3f" entry = triggerSyncGapRatio3, "Sync: Trigger Latest Ratio3", float, "%.3f" entry = triggerStateIndex3, "triggerStateIndex3", int, "%d" -entry = synchronizationCounter4, "sync: trigger wheel sync counter4", int, "%d" +entry = synchronizationCounter4, "sync: wheel sync counter4", int, "%d" entry = vvtToothDurations04, "vvtToothDurations04", int, "%d" -entry = vvtCurrentPosition4, "sync: Primary Cam Position4", float, "%.3f" -entry = vvtToothPosition14, "sync: Cam Tooth Position 14", float, "%.3f" -entry = vvtToothPosition24, "sync: Cam Tooth Position 24", float, "%.3f" -entry = vvtToothPosition34, "sync: Cam Tooth Position 34", float, "%.3f" -entry = vvtToothPosition44, "sync: Cam Tooth Position 44", float, "%.3f" +entry = vvtCurrentPosition4, "sync: Primary Position4", float, "%.3f" +entry = vvtToothPosition14, "sync: Cam Position 14", float, "%.3f" +entry = vvtToothPosition24, "sync: Cam Position 24", float, "%.3f" +entry = vvtToothPosition34, "sync: Cam Position 34", float, "%.3f" +entry = vvtToothPosition44, "sync: Cam Position 44", float, "%.3f" entry = triggerSyncGapRatio4, "Sync: Trigger Latest Ratio4", float, "%.3f" entry = triggerStateIndex4, "triggerStateIndex4", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" @@ -9669,9 +9672,13 @@ dialog = tcuControls, "Transmission Settings" text = "More about rusefi on the web" webHelp = "https://rusefi.com/" - dialog = veTableDialog - topicHelp = "veTableDialogHelp" - panel = veTableTbl, South + dialog = veOverrideModeSelector, "" + field = "Override VE table load axis", veOverrideMode + + dialog = veTableDialog, "", border + topicHelp = "veTableDialogHelp" + panel = veOverrideModeSelector, North + panel = veTableTbl, Center dialog = veTableDialog3D, "VE Table" topicHelp = "veTableDialogHelp" diff --git a/generated/tunerstudio/generated/signature_XYZ.txt b/generated/tunerstudio/generated/signature_XYZ.txt index 0c5ce7e..d73a936 100644 --- a/generated/tunerstudio/generated/signature_XYZ.txt +++ b/generated/tunerstudio/generated/signature_XYZ.txt @@ -1,4 +1,4 @@ ! Generated by gen_signature.sh ! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar ! gen_signature.sh Using env variable branch [main] -#define TS_SIGNATURE "rusEFI main.2024.12.28.XYZ.@@SIGNATURE_HASH@@" +#define TS_SIGNATURE "rusEFI main.2024.12.29.XYZ.@@SIGNATURE_HASH@@"