Merge pull request #218 from makers-for-life/no-limit-on-plateau-pres…

…sure remove limitation for peak pressure decrease and plateau pressure inc…
makers-for-life · Apr 28, 2020 · 5c8bb20 · 5c8bb20
2 parents aa3cd70 + c34f435
commit 5c8bb20
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/software/firmware/srcs/pressure_controller.cpp b/src/software/firmware/srcs/pressure_controller.cpp
@@ -365,23 +365,17 @@ void PressureController::onPlateauPressureIncrease() {
 
     m_maxPlateauPressureCommand = m_maxPlateauPressureCommand + 10u;
 
-    if (m_maxPlateauPressureCommand
-        > min(m_maxPeakPressureCommand, static_cast<uint16_t>(CONST_MAX_PLATEAU_PRESSURE))) {
-        m_maxPlateauPressureCommand =
-            min(m_maxPeakPressureCommand, static_cast<uint16_t>(CONST_MAX_PLATEAU_PRESSURE));
-    }
+    m_maxPlateauPressureCommand =
+        min(m_maxPlateauPressureCommand, static_cast<uint16_t>(CONST_MAX_PLATEAU_PRESSURE));
 }
 
 void PressureController::onPeakPressureDecrease(uint8_t p_decrement) {
     DBG_DO(Serial.println("Peak Pressure --");)
 
     m_maxPeakPressureCommand = m_maxPeakPressureCommand - p_decrement;
 
-    if (m_maxPeakPressureCommand
-        < max(m_maxPlateauPressureCommand, static_cast<uint16_t>(CONST_MIN_PEAK_PRESSURE))) {
-        m_maxPeakPressureCommand =
-            max(m_maxPlateauPressureCommand, static_cast<uint16_t>(CONST_MIN_PEAK_PRESSURE));
-    }
+    m_maxPeakPressureCommand =
+            max(m_maxPeakPressureCommand, static_cast<uint16_t>(CONST_MIN_PEAK_PRESSURE));
 }
 
 void PressureController::onPeakPressureIncrease(uint8_t p_increment) {