state-handler: fix merge conflicts

2022-10-10 11:09:29 +03:00
parent f8d1462113
commit c82d4c75e8
2 changed files with 12 additions and 33 deletions
--- a/StateHandler/src/StateHandler.cpp
+++ b/StateHandler/src/StateHandler.cpp
@@ -48,24 +48,6 @@ StateHandler::getSetSpeed ()
  return (unsigned int)this->set[FAN_SPEED].getCurrent ();
 }

-void
-StateHandler::displaySet (unsigned int value1, unsigned int value2)
-{
-  // TODO
-  /**
-   * MANUAL MODE:
-   * ----------------
-   * SPEED: 20%
-   * PRESSURE: XXPa
-   * ----------------
-   * AUTO MODE:
-   * ----------------
-   * PRESSURE SET: 35Pa
-   * PRESSURE CUR: XXPa
-   * ----------------
-   */
-}
-
 void
 StateHandler::HandleState (const Event &event)
 {