Merge branch 'master' into newparse-outputs

FOME-Tech · Nov 24, 2024 · e9ca1e2 · e9ca1e2
2 parents 822518c + 41d839e
commit e9ca1e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/firmware/controllers/algo/ignition_state.txt b/firmware/controllers/algo/ignition_state.txt
@@ -4,7 +4,7 @@ struct_no_prefix ignition_state_s
     float baseDwell;;"ms", 1, 0, 0, 30, 1
 	floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@;"ms", 1, 0, 0, 30, 1
 
-	angle_t dwellAngle;ignition dwell duration\nas crankshaft angle;"deg", 1, 0, 0, 120, 1
+	angle_t dwellAngle;@@GAUGE_NAME_IGNITION_DWELL_ANGLE@@;"deg", 1, 0, 0, 120, 1
 
 	int16_t autoscale cltTimingCorrection;Ign: CLT correction;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2
 	int16_t autoscale timingIatCorrection;Ign: IAT correction;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2

diff --git a/firmware/integration/rusefi_config_shared.txt b/firmware/integration/rusefi_config_shared.txt
@@ -175,6 +175,7 @@
 #define GAUGE_NAME_TIMING_ADVANCE "Ign: Timing Base"
 #define GAUGE_NAME_DWELL_DUTY "Ign: Coil duty cycle"
 #define GAUGE_COIL_DWELL_TIME "Ign: Dwell"
+#define GAUGE_NAME_IGNITION_DWELL_ANGLE "Ign: Dwell angle"
 #define GAUGE_NAME_IGNITION_LOAD "Ign: Load"
 #define GAUGE_NAME_IGNITION_MODE "Ign: Mode"
 

diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
@@ -1439,11 +1439,11 @@ gaugeCategory = Vehicle Speed
 gaugeCategory = Ignition
 	sparkCutReasonGauge = sparkCutReason, "Ign: Cut code", "code", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
 	ignadvGauge = ignitionAdvance,		"Ign: Timing",	"degrees",	-100,	100,	-999,	-999,	999,	999,	1, 1
-	dwellGauge		= sparkDwell,			"Ign: Dwell",		"mSec",		0,	10,	0.5,	1.0,	6.0,	8.0,	1, 1
+	dwellGauge		= sparkDwell, @@GAUGE_COIL_DWELL_TIME@@,		"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
 	baseDwellGauge = baseDwell,"baseDwell", "ms", 0.0,30.0, 0.0,30.0, 0.0,30.0, 1,1
-	dwellAngleGauge = dwellAngle,"Ign: Dwell angle", "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1
+	dwellAngleGauge = dwellAngle,@@GAUGE_NAME_IGNITION_DWELL_ANGLE@@, "deg", 0.0,120.0, 0.0,120.0, 0.0,120.0, 1,1
 	cltTimingCorrectionGauge = cltTimingCorrection,"Ign: CLT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2
 	timingIatCorrectionGauge = timingIatCorrection,"Ign: IAT correction", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2
 	timingPidCorrectionGauge = timingPidCorrection,"Ign: Idle timing adjustment", "deg", -20.0,20.0, -20.0,20.0, -20.0,20.0, 2,2