only check throttle jam while ignition is on #489

FOME-Tech · Sep 18, 2024 · 64108b6 · 64108b6
1 parent 877ec23
commit 64108b6
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -479,6 +479,7 @@ expected<percent_t> EtbController::getClosedLoop(percent_t target, percent_t obs
 		return getClosedLoopAutotune(target, observation);
 	} else {
 		checkJam(target, observation);
+
 		// Normal case - use PID to compute closed loop part
 		return m_pid.getOutput(target, observation, etbPeriodSeconds);
 	}
@@ -614,13 +615,12 @@ void EtbController::checkJam(percent_t setpoint, percent_t observation) {
 	if (jamDetectThreshold != 0) {
 		auto nowNt = getTimeNowNt();
 
-		if (absError > jamDetectThreshold) {
+		if (absError > jamDetectThreshold && engine->module<IgnitionController>()->getIgnState()) {
 			if (m_jamDetectTimer.hasElapsedSec(engineConfiguration->etbJamTimeout)) {
 				// ETB is jammed!
 				jamDetected = true;
 
-				// TODO: do something about it!
-				// getLimpManager()->reportEtbProblem();
+				getLimpManager()->reportEtbProblem();
 			}
 		} else {
 			m_jamDetectTimer.reset(nowNt);

diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
@@ -152,7 +152,7 @@ class Engine final : public TriggerStateListener {
 		AlternatorController,
 #endif /* EFI_ALTERNATOR_CONTROL */
 		MainRelayController,
-		IgnitionController,
+		Mockable<IgnitionController>,
 		Mockable<AcController>,
 		PrimeController,
 		DfcoController,

diff --git a/firmware/controllers/ignition_controller.h b/firmware/controllers/ignition_controller.h
@@ -6,8 +6,14 @@
 
 class IgnitionController : public EngineModule {
 public:
+	using interface_t = IgnitionController;
+
 	void onSlowCallback() override;
 
+	virtual bool getIgnState() const {
+		return m_lastState;
+	}
+
 private:
 	Timer m_timeSinceIgnVoltage;
 	bool m_lastState = false;

diff --git a/unit_tests/mocks.cpp b/unit_tests/mocks.cpp
@@ -35,3 +35,9 @@ MockStepperHardware::~MockStepperHardware() { }
 
 MockTsChannel::MockTsChannel() : TsChannelBase("mock") { }
 MockTsChannel::~MockTsChannel() { }
+
+MockIdleController::MockIdleController() { }
+MockIdleController::~MockIdleController() { }
+
+MockIgnitionController::MockIgnitionController() { }
+MockIgnitionController::~MockIgnitionController() { }
diff --git a/unit_tests/mocks.h b/unit_tests/mocks.h
@@ -122,6 +122,10 @@ class MockTsChannel : public TsChannelBase {
 };
 
 class MockIdleController : public IIdleController {
+public:
+	MockIdleController();
+	virtual ~MockIdleController();
+
 	MOCK_METHOD(IIdleController::Phase, determinePhase, (int rpm, int targetRpm, SensorResult tps, float vss, float crankingTaperFraction), (override));
 	MOCK_METHOD(int, getTargetRpm, (float clt), (override));
 	MOCK_METHOD(float, getCrankingOpenLoop, (float clt), (const, override));
@@ -132,3 +136,11 @@ class MockIdleController : public IIdleController {
 	MOCK_METHOD(bool, isIdlingOrTaper, (), (const, override));
 	MOCK_METHOD(float, getIdleTimingAdjustment, (int rpm), (override));
 };
+
+class MockIgnitionController : public IgnitionController {
+public:
+	MockIgnitionController();
+	virtual ~MockIgnitionController();
+
+	MOCK_METHOD(bool, getIgnState, (), (const, override));
+};
diff --git a/unit_tests/tests/actuators/test_etb.cpp b/unit_tests/tests/actuators/test_etb.cpp
@@ -740,6 +740,13 @@ TEST(etb, closedLoopPid) {
 TEST(etb, jamDetection) {
 	EngineTestHelper eth(engine_type_e::TEST_ENGINE);
 
+	MockIgnitionController ignController;
+
+	EXPECT_CALL(ignController, getIgnState).WillRepeatedly(Return(true));
+
+	// This only works when the ignition is on!
+	engine->module<IgnitionController>().set(&ignController);
+
 	// Must have TPS & PPS initialized for ETB setup
 	Sensor::setMockValue(SensorType::Tps1Primary, 0);
 	Sensor::setMockValue(SensorType::Tps1, 0.0f, true);