don't segfault lol #489

FOME-Tech · Sep 18, 2024 · e94920f · e94920f
1 parent abad53b
commit e94920f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -494,9 +494,11 @@ void EtbController::setOutput(expected<percent_t> outputValue) {
 		return;
 	}
 
+	bool limpAllowThrottle = getLimpManager()->allowElectronicThrottle() || engine->etbIgnoreJamProtection;
+
 	// If not ETB, or ETB is allowed, output is valid, and we aren't paused, output to motor.
 	if (!isEtbMode() ||
-	   (getLimpManager()->allowElectronicThrottle()
+	   (limpAllowThrottle
 		&& outputValue
 		&& !engineConfiguration->pauseEtbControl)) {
 		m_motor->enable();

diff --git a/firmware/controllers/limp_manager.cpp b/firmware/controllers/limp_manager.cpp
@@ -248,7 +248,7 @@ void LimpManager::setFaultRevLimit(int limit) {
 }
 
 bool LimpManager::allowElectronicThrottle() const {
-	return m_allowEtb || engine->etbIgnoreJamProtection;
+	return m_allowEtb;
 }
 
 bool LimpManager::allowTriggerInput() const {