Skip to content

Commit

Permalink
Custom Auto-generated Configs
Browse files Browse the repository at this point in the history 
[no ci]
  • Loading branch information
@actions-user
actions-user committed Dec 29, 2024
1 parent e46b6c0 commit df0ea4e
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 140 deletions.
60 changes: 30 additions & 30 deletions generated/console/binary/generated/data_logs.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
129 changes: 69 additions & 60 deletions generated/console/binary_log/log_fields_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<KnockController>()->m_knockLevel, "Knock: Current level", "Volts", 2},
{___engine.module<KnockController>()->m_knockCyl[0], "Knock: Cyl 1", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[1], "Knock: Cyl 2", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[2], "Knock: Cyl 3", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[3], "Knock: Cyl 4", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[4], "Knock: Cyl 5", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[5], "Knock: Cyl 6", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[6], "Knock: Cyl 7", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[7], "Knock: Cyl 8", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[8], "Knock: Cyl 9", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[9], "Knock: Cyl 10", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[10], "Knock: Cyl 11", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[11], "Knock: Cyl 12", "dBv", 0},
{___engine.module<KnockController>()->m_knockRetard, "Knock: Retard", "deg", 1},
{___engine.module<KnockController>()->m_knockThreshold, "Knock: Threshold", "", 0},
{___engine.module<KnockController>()->m_knockCount, "Knock: Count", "", 0},
{___engine.module<KnockController>()->m_maximumRetard, "Knock: Max retard", "", 0},
{___engine.module<KnockController>()->m_knockSpectrum[0], "Knock: SpectrumData 1", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[1], "Knock: SpectrumData 2", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[2], "Knock: SpectrumData 3", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[3], "Knock: SpectrumData 4", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[4], "Knock: SpectrumData 5", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[5], "Knock: SpectrumData 6", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[6], "Knock: SpectrumData 7", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[7], "Knock: SpectrumData 8", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[8], "Knock: SpectrumData 9", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[9], "Knock: SpectrumData 10", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[10], "Knock: SpectrumData 11", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[11], "Knock: SpectrumData 12", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[12], "Knock: SpectrumData 13", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[13], "Knock: SpectrumData 14", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[14], "Knock: SpectrumData 15", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrum[15], "Knock: SpectrumData 16", "compressed data", 0},
{___engine.module<KnockController>()->m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", "compressed N + N", 0},
{___engine.module<KnockController>()->m_knockFrequencyStart, "Knock: Start Freq", "Hz", 0},
{___engine.module<KnockController>()->m_knockFrequencyStep, "Knock: Step Freq", "Hz", 0},
{___engine.module<KnockController>()->m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", "multiplier", 0},
{engine->module<KnockController>()->m_knockLevel, "Knock: Current level", "Volts", 2},
{engine->module<KnockController>()->m_knockCyl[0], "Knock: Cyl 1", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[1], "Knock: Cyl 2", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[2], "Knock: Cyl 3", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[3], "Knock: Cyl 4", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[4], "Knock: Cyl 5", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[5], "Knock: Cyl 6", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[6], "Knock: Cyl 7", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[7], "Knock: Cyl 8", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[8], "Knock: Cyl 9", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[9], "Knock: Cyl 10", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[10], "Knock: Cyl 11", "dBv", 0},
{engine->module<KnockController>()->m_knockCyl[11], "Knock: Cyl 12", "dBv", 0},
{engine->module<KnockController>()->m_knockRetard, "Knock: Retard", "deg", 1},
{engine->module<KnockController>()->m_knockThreshold, "Knock: Threshold", "", 0},
{engine->module<KnockController>()->m_knockCount, "Knock: Count", "", 0},
{engine->module<KnockController>()->m_maximumRetard, "Knock: Max retard", "", 0},
{engine->module<KnockController>()->m_knockSpectrum[0], "Knock: SpectrumData 1", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[1], "Knock: SpectrumData 2", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[2], "Knock: SpectrumData 3", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[3], "Knock: SpectrumData 4", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[4], "Knock: SpectrumData 5", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[5], "Knock: SpectrumData 6", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[6], "Knock: SpectrumData 7", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[7], "Knock: SpectrumData 8", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[8], "Knock: SpectrumData 9", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[9], "Knock: SpectrumData 10", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[10], "Knock: SpectrumData 11", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[11], "Knock: SpectrumData 12", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[12], "Knock: SpectrumData 13", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[13], "Knock: SpectrumData 14", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[14], "Knock: SpectrumData 15", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrum[15], "Knock: SpectrumData 16", "compressed data", 0},
{engine->module<KnockController>()->m_knockSpectrumChannelCyl, "Knock: ChannelAndCylNumber", "compressed N + N", 0},
{engine->module<KnockController>()->m_knockFrequencyStart, "Knock: Start Freq", "Hz", 0},
{engine->module<KnockController>()->m_knockFrequencyStep, "Knock: Step Freq", "Hz", 0},
{engine->module<KnockController>()->m_knockFuelTrimMultiplier, "Knock: Fuel trim when knock", "multiplier", 0},
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<InjectorModelPrimary>()->m_deadtime, "Fuel: injector lag", "ms", 3},
{engine->module<InjectorModelPrimary>()->m_deadtime, "Fuel: injector lag", "ms", 3},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<InjectorModelPrimary>()->pressureDelta, "Fuel: Injector pressure delta", "kPa", 1},
{engine->module<InjectorModelPrimary>()->pressureDelta, "Fuel: Injector pressure delta", "kPa", 1},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<InjectorModelPrimary>()->pressureRatio, "Fuel: Injector pressure ratio", "", 3},
{engine->module<InjectorModelPrimary>()->pressureRatio, "Fuel: Injector pressure ratio", "", 3},
#endif
#if EFI_LAUNCH_CONTROL
{engine->launchController.retardThresholdRpm, "retardThresholdRpm", "", 0},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->luaTargetAdd, "Boost: Lua target add", "v", 1, "Boost Control"},
{engine->module<BoostController>()->luaTargetAdd, "Boost: Lua target add", "v", 1, "Boost Control"},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->boostOutput, "Boost: Output", "percent", 2, "Boost Control"},
{engine->module<BoostController>()->boostOutput, "Boost: Output", "percent", 2, "Boost Control"},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->luaTargetMult, "Boost: Lua target mult", "v", 1, "Boost Control"},
{engine->module<BoostController>()->luaTargetMult, "Boost: Lua target mult", "v", 1, "Boost Control"},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->openLoopPart, "Boost: Open loop", "v", 1, "Boost Control"},
{engine->module<BoostController>()->openLoopPart, "Boost: Open loop", "v", 1, "Boost Control"},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->luaOpenLoopAdd, "Boost: Lua open loop add", "v", 1, "Boost Control"},
{engine->module<BoostController>()->luaOpenLoopAdd, "Boost: Lua open loop add", "v", 1, "Boost Control"},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->boostControllerClosedLoopPart, "Boost: Closed loop", "%", 1, "Boost Control"},
{engine->module<BoostController>()->boostControllerClosedLoopPart, "Boost: Closed loop", "%", 1, "Boost Control"},
#endif
#if EFI_BOOST_CONTROL
{___engine.module<BoostController>()->boostControlTarget, "Boost: Target", "kPa", 1, "Boost Control"},
{engine->module<BoostController>()->boostControlTarget, "Boost: Target", "kPa", 1, "Boost Control"},
#endif
{___engine.module<FanControl1>()->radiatorFanStatus, "radiatorFanStatus", "", 0},
{engine->module<FanControl1>()->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},
Expand Down Expand Up @@ -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<IdleController>().unmock().currentIdlePosition, "Idle: Position", "%", 1},
{engine->module<IdleController>().unmock().currentIdlePosition, "Idle: Position", "%", 1},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().baseIdlePosition, "idle: base value", "", 0},
{engine->module<IdleController>().unmock().baseIdlePosition, "idle: base value", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().idleClosedLoop, "Idle: Closed loop", "", 0},
{engine->module<IdleController>().unmock().idleClosedLoop, "Idle: Closed loop", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().iacByTpsTaper, "idle: iacByTpsTaper portion", "", 0},
{engine->module<IdleController>().unmock().iacByTpsTaper, "idle: iacByTpsTaper portion", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().idleTarget, "Idle: Target RPM", "", 0},
{engine->module<IdleController>().unmock().idleTarget, "Idle: Target RPM", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().targetRpmByClt, "Idle: Target RPM base", "", 0},
{engine->module<IdleController>().unmock().targetRpmByClt, "Idle: Target RPM base", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().targetRpmAc, "Idle: Target A/C RPM", "", 0},
{engine->module<IdleController>().unmock().targetRpmAc, "Idle: Target A/C RPM", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().iacByRpmTaper, "idle: iacByRpmTaper portion", "", 0},
{engine->module<IdleController>().unmock().iacByRpmTaper, "idle: iacByRpmTaper portion", "", 0},
#endif
#if EFI_PROD_CODE && EFI_IDLE_CONTROL
{___engine.module<IdleController>().unmock().luaAdd, "idle: Lua Adder", "", 0},
{engine->module<IdleController>().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<VvtController1>()->vvtTarget, "vvtTarget", "deg", 1},
{engine->module<VvtController1>()->vvtTarget, "vvtTarget", "deg", 1},
#endif
#if EFI_VVT_PID
{___engine.module<VvtController1>()->vvtOutput, "vvtOutput", "%", 0},
{engine->module<VvtController1>()->vvtOutput, "vvtOutput", "%", 0},
#endif
#if EFI_SHAFT_POSITION_INPUT
{___engine.lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2},
{engine->lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2},
#endif
};
Loading

0 comments on commit df0ea4e

Please sign in to comment.