We need to reshuffle timing calculation a bit, add one more gauge #5235

This commit is contained in:
Andrey 2023-04-12 15:24:23 -04:00
parent 32b7b014c9
commit 0c6062be45
4 changed files with 7 additions and 2 deletions

View File

@ -101,7 +101,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2
uint16_t canReadCounter;;"",1, 0, 0, 0, 0
int16_t autoscale tpsAccelFuel;@@GAUGE_NAME_FUEL_TPS_EXTRA@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 3
! Ignition
int16_t autoscale ignitionAdvance;@@GAUGE_NAME_TIMING_ADVANCE@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1
int16_t autoscale ignitionAdvance;ignitionAdvance;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1
uint16_t unusedDwellWasHere
uint16_t autoscale coilDutyCycle;@@GAUGE_NAME_DWELL_DUTY@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0

View File

@ -10,6 +10,9 @@ struct_no_prefix ignition_state_s
int16_t autoscale timingIatCorrection;"Ignition: IAT correction";"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@
int16_t autoscale timingPidCorrection;"Ignition: PID correction";"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@
int16_t autoscale baseIgnitionAdvance;@@GAUGE_NAME_TIMING_ADVANCE@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1
int16_t autoscale correctedIgnitionAdvance;@@GAUGE_NAME_ADJUSTED_TIMING@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1
float dwellVoltageCorrection;"Ignition: dwell corr"
float luaTimingAdd;"Ignition: Lua add";"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@

View File

@ -1866,6 +1866,7 @@ end_struct
#define GAUGE_NAME_TC_RATIO "Torque Converter Ratio"
#define GAUGE_NAME_TIMING_ADVANCE "Timing: base ignition"
#define GAUGE_NAME_ADJUSTED_TIMING "Timing: ignition"
#define GAUGE_NAME_VVS "Vehicle Speed"
#define GAUGE_NAME_GEAR_RATIO "Gearbox Ratio"
#define GAUGE_NAME_DETECTED_GEAR "Detected Gear"

View File

@ -1352,7 +1352,8 @@ gaugeCategory = VVT
gaugeCategory = Ignition
sparkCutReasonGauge = sparkCutReason,"Spark Cut Code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
ignadvGauge = ignitionAdvance, @@GAUGE_NAME_TIMING_ADVANCE@@, "degrees", -100, 100, -999, -999, 999, 999, 1, 1
baseIgnAdvGauge = baseIgnitionAdvance, @@GAUGE_NAME_TIMING_ADVANCE@@, "degrees", -100, 100, -999, -999, 999, 999, 1, 1
ignadvGauge = correctedIgnitionAdvance, @@GAUGE_NAME_TIMING_ADVANCE@@, "degrees", -100, 100, -999, -999, 999, 999, 1, 1
dwellGauge = sparkDwell, "Dwell", "mSec", 0, 10, 0.5, 1.0, 6.0, 8.0, 1, 1
coilDutyCycleGauge = coilDutyCycle, @@GAUGE_NAME_DWELL_DUTY@@, "%", 0, 110, 0, 0, 90, 100, 1, 1
ignitionLoadGauge = ignitionLoad, @@GAUGE_NAME_IGNITION_LOAD@@, "%", 0, 300, 0, 0, 300, 300, 1, 1