it's going to be p

This commit is contained in:
rusefillc 2023-05-31 17:15:43 -04:00
parent 447b405718
commit 91d08f0465
3 changed files with 3 additions and 7 deletions

View File

@ -221,6 +221,8 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2
int8_t[4 iterate] vvtTargets;;"deg",1, 0, 0, 0, 0
uint16_t turboSpeed;@@GAUGE_NAME_TURBO_SPEED@@;"hz",1, 0, 0, 0, 0
int16_t[MAX_CYLINDER_COUNT iterate] autoscale ignitionAdvanceCyl;Ign: Timing Cyl;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1
! fun fact: we have a separate pid_state.txt file for a bit of a different structure huh?
struct pid_status_s
float pTerm;;"", 1, 0, -50000, 50000, 2

View File

@ -17,7 +17,6 @@ float dwellVoltageCorrection;Ign: Dwell voltage correction
float luaTimingAdd;Ign: Lua timing add;"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
float luaTimingMult;Ign: Lua timing mult;"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
uint8_t[MAX_CYLINDER_COUNT iterate] perCylinderTiming;;"Timing Cyl", 1, 0, 0, 0, 0
bit luaIgnitionSkip;Ign: Lua Spark Skip
end_struct

View File

@ -9,11 +9,6 @@
#include "spark_logic.h"
// dependency injection
#include "engine_state.h"
#include "rpm_calculator_api.h"
// end of injection
#include "utlist.h"
#include "event_queue.h"
@ -94,7 +89,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
// Negate because timing *before* TDC, and we schedule *after* TDC
- getEngineState()->timingAdvance[event->cylinderNumber];
engine->ignitionState.perCylinderTiming[event->cylinderIndex] = correctedSparkAngle;
engine->outputChannels.ignitionAdvanceCyl[event->cylinderIndex] = correctedSparkAngle;
angle_t sparkAngle = correctedSparkAngle
// Offset by this cylinder's position in the cycle