From fe1d8eea61630436c4745a4ceff866fcae177e9c Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Fri, 14 Oct 2022 16:33:44 +0300 Subject: [PATCH] event: add pressure member Addition of a pressure parameter called from main and displayed on lcd --- StateHandler/inc/StateHandler.h | 5 +++++ StateHandler/src/StateHandler.cpp | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/StateHandler/inc/StateHandler.h b/StateHandler/inc/StateHandler.h index bd38137..81bcc40 100644 --- a/StateHandler/inc/StateHandler.h +++ b/StateHandler/inc/StateHandler.h @@ -79,6 +79,10 @@ public: unsigned int getSetSpeed (); /** Display values on LCD depending on current mode + * + * MANUAL MODE: SPEED: XX% PRESSURE: XXPa + * + * AUTO MODE: P. SET: XXPa P. CURR: XXPa * * @param value1 value to be displayed on LCD line 0 * @param value2 value to be displayed on LCD line 1 @@ -86,6 +90,7 @@ public: void displaySet (unsigned int value1, unsigned int value2); /** Handle the given event of the current state + * * @param event event to be handled in the current state */ void HandleState (const Event &event); diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp index 40bb150..1fcf13d 100644 --- a/StateHandler/src/StateHandler.cpp +++ b/StateHandler/src/StateHandler.cpp @@ -28,25 +28,11 @@ StateHandler::displaySet (unsigned int value1, unsigned int value2) if (current_mode == MANUAL) { - /* - * MANUAL MODE: - * ---------------- - * SPEED: 20% - * PRESSURE: XXPa - * ---------------- - */ snprintf (line_up, 16, "SPEED: %02d%", value1); snprintf (line_down, 16, "PRESSURE: %02dPa", value2); } else { - /* - * AUTO MODE: - * ---------------- - * P. SET: 35Pa - * P. CURR: XXPa - * ---------------- - */ snprintf (line_up, 16, "P. SET: %02dPa", value1); snprintf (line_down, 16, "P. CURR: %02dPa", value2); }