simpler ETB jam detection #489

rather than try to integrate error over time, simply fault if there's been too much error for too long. Up to +-X error is allowed for any period of time, more is allowed for Y seconds.
FOME-Tech · Sep 17, 2024 · 21b6ee2 · 21b6ee2
1 parent 23dda39
commit 21b6ee2
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 155 deletions.
diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -199,17 +199,13 @@ bool EtbController::init(dc_function_e function, DcMotor *motor, pid_s *pidParam
 	m_pid.initPidClass(pidParameters);
 	m_pedalMap = pedalMap;
 
-	// Ignore 3% position error before complaining
-	m_errorAccumulator.init(3.0f, etbPeriodSeconds);
-
 	reset();
 
 	return true;
 }
 
 void EtbController::reset() {
 	m_shouldResetPid = true;
-	etbDutyRateOfChange = etbDutyAverage = 0;
 	m_dutyRocAverage.reset();
 	m_dutyAverage.reset();
 	etbTpsErrorCounter = 0;
@@ -482,15 +478,7 @@ expected<percent_t> EtbController::getClosedLoop(percent_t target, percent_t obs
 	if (m_isAutotune) {
 		return getClosedLoopAutotune(target, observation);
 	} else {
-		// Check that we're not over the error limit
-		etbIntegralError = m_errorAccumulator.accumulate(target - observation);
-
-		// Allow up to 10 percent-seconds of error
-		if (etbIntegralError > 10.0f) {
-			// TODO: figure out how to handle uncalibrated ETB 
-			//getLimpManager()->reportEtbProblem();
-		}
-
+		checkJam(target, observation);
 		// Normal case - use PID to compute closed loop part
 		return m_pid.getOutput(target, observation, etbPeriodSeconds);
 	}
@@ -615,33 +603,24 @@ void EtbController::update() {
 		return;
 	}
 
-	auto output = ClosedLoopController::update();
-
-	if (!output) {
-		return;
-	}
-
-	checkOutput(output.Value);
+	ClosedLoopController::update();
 }
 
-void EtbController::checkOutput(percent_t output) {
-	etbDutyAverage = m_dutyAverage.average(absF(output));
-
-	etbDutyRateOfChange = m_dutyRocAverage.average(absF(output - prevOutput));
-	prevOutput = output;
+void EtbController::checkJam(percent_t setpoint, percent_t observation) {
+	float absError = std::abs(setpoint - observation);
 
-	float integrator = absF(m_pid.getIntegration());
-	auto integratorLimit = engineConfiguration->etbJamIntegratorLimit;
+	auto jamDetectThreshold = engineConfiguration->jamDetectThreshold;
 
-	if (integratorLimit != 0) {
+	if (jamDetectThreshold != 0) {
 		auto nowNt = getTimeNowNt();
 
-		if (integrator > integratorLimit) {
+		if (absError > jamDetectThreshold) {
 			if (m_jamDetectTimer.hasElapsedSec(engineConfiguration->etbJamTimeout)) {
 				// ETB is jammed!
 				jamDetected = true;
 
 				// TODO: do something about it!
+				// getLimpManager()->reportEtbProblem();
 			}
 		} else {
 			m_jamDetectTimer.reset(getTimeNowNt());

diff --git a/firmware/controllers/actuators/electronic_throttle.txt b/firmware/controllers/actuators/electronic_throttle.txt
@@ -18,8 +18,6 @@ struct_no_prefix electronic_throttle_s
 	bit etbRevLimitActive
 	bit jamDetected
 
-	float etbDutyRateOfChange;"ETB duty rate of change";"per", 1, 0, -0,20, 2
-	float etbDutyAverage;"ETB average duty";"per", 1, 0, -20,50, 2
 	uint16_t etbTpsErrorCounter;"ETB TPS error counter";"count", 1, 0, 0,3, 0
 	uint16_t etbPpsErrorCounter;"ETB pedal error counter";"count", 1, 0, 0,3, 0
 

diff --git a/firmware/controllers/actuators/electronic_throttle_impl.h b/firmware/controllers/actuators/electronic_throttle_impl.h
@@ -12,7 +12,6 @@
 
 #include "sensor.h"
 #include "efi_pid.h"
-#include "error_accumulator.h"
 #include "electronic_throttle_generated.h"
 #include "exp_average.h"
 
@@ -53,9 +52,9 @@ class EtbController : public IEtbController, public electronic_throttle_s {
 	expected<percent_t> getClosedLoop(percent_t setpoint, percent_t observation) override;
 	expected<percent_t> getClosedLoopAutotune(percent_t setpoint, percent_t actualThrottlePosition);
 
-	void setOutput(expected<percent_t> outputValue) override;
+	void checkJam(percent_t setpoint, percent_t observation);
 
-	void checkOutput(percent_t output);
+	void setOutput(expected<percent_t> outputValue) override;
 
 	// Used to inspect the internal PID controller's state
 	const pid_state_s& getPidState() const override { return m_pid; };
@@ -90,8 +89,6 @@ class EtbController : public IEtbController, public electronic_throttle_s {
 	DcMotor *m_motor = nullptr;
 	Pid m_pid;
 	bool m_shouldResetPid = false;
-	// todo: rename to m_targetErrorAccumulator
-	ErrorAccumulator m_errorAccumulator;
 
 	/**
 	 * @return true if OK, false if should be disabled

diff --git a/firmware/controllers/closed_loop_controller.h b/firmware/controllers/closed_loop_controller.h
@@ -9,11 +9,9 @@
 template <typename TInput, typename TOutput>
 class ClosedLoopController {
 public:
-	expected<TOutput> update() {
+	void update() {
 		expected<TOutput> outputValue = getOutput();
 		setOutput(outputValue);
-
-		return outputValue;
 	}
 
 private:

diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
@@ -1323,7 +1323,7 @@ float tChargeAirDecrLimit;Maximum allowed rate of decrease allowed for the estim
 
 	uint16_t autoscale fordInjectorSmallPulseBreakPoint;;"mg", 0.001, 0, 0, 65, 3
 
-	uint8_t etbJamIntegratorLimit;;"%", 1, 0, 0, 50, 0
+	uint8_t jamDetectThreshold;;"%", 1, 0, 0, 50, 0
 
 ! Someday there will be a 6th option for BMW S55 that uses a separate shaft just for HPFP
 #define hpfp_cam_e_enum "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2"

diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini
@@ -4225,7 +4225,7 @@ dialog = tcuControls, "Transmission Settings"
 		field = "PWM Frequency",						etbFreq
 		field = "Minimum ETB position",					etbMinimumPosition
 		field = "Maximum ETB position",					etbMaximumPosition
-		field = "Jam detection integrator max",			etbJamIntegratorLimit
+		field = "Jam detection error max",				jamDetectThreshold
 		field = "Jam detection timeout period",			etbJamTimeout
 		field = "Duty Averaging Length",                etbExpAverageLength
 		field = "Rate of change Averaging Length",      etbRocExpAverageLength

diff --git a/firmware/util/math/error_accumulator.cpp b/firmware/util/math/error_accumulator.cpp
diff --git a/firmware/util/math/error_accumulator.h b/firmware/util/math/error_accumulator.h
diff --git a/firmware/util/util.mk b/firmware/util/util.mk
@@ -8,7 +8,6 @@ UTILSRC_CPP = \
 	$(UTIL_DIR)/containers/listener_array.cpp \
 	$(UTIL_DIR)/containers/local_version_holder.cpp \
 	$(UTIL_DIR)/math/biquad.cpp \
-	$(UTIL_DIR)/math/error_accumulator.cpp \
 	$(UTIL_DIR)/math/efi_pid.cpp \
 	$(UTIL_DIR)/math/interpolation.cpp \
 	$(PROJECT_DIR)/util/datalogging.cpp \

diff --git a/unit_tests/tests/util/test_error_accumulator.cpp b/unit_tests/tests/util/test_error_accumulator.cpp
diff --git a/unit_tests/tests/util/test_util.mk b/unit_tests/tests/util/test_util.mk
@@ -1,7 +1,6 @@
 
 
 CPPSRC += 	$(PROJECT_DIR)/../unit_tests/tests/util/test_buffered_writer.cpp \
-	$(PROJECT_DIR)/../unit_tests/tests/util/test_error_accumulator.cpp \
 	$(PROJECT_DIR)/../unit_tests/tests/util/test_exp_average.cpp \
 	$(PROJECT_DIR)/../unit_tests/tests/util/test_hash.cpp \