diff --git a/StateHandler/inc/Event.h b/StateHandler/inc/Event.h index 9bf7e45..4e273a6 100644 --- a/StateHandler/inc/Event.h +++ b/StateHandler/inc/Event.h @@ -8,11 +8,13 @@ #ifndef EVENT_H_ #define EVENT_H_ -class Event { - public: - virtual ~Event(){}; +class Event +{ +public: + virtual ~Event (){}; - enum eventType { + enum eventType + { /** Start of the event */ eEnter, /** End of the event*/ @@ -23,10 +25,11 @@ class Event { /** Time event */ eTick }; - Event(eventType e = eTick, uint8_t b = 0, int t = 0) - : type(e), button(b), temp(t){}; + Event (eventType e = eTick, uint8_t b = 0) : type (e), button (b){}; + Event (eventType e = eTick, int16_t pres = 0) : type (e), pressure (pres){}; eventType type; uint8_t button; + int16_t pressure; int temp; }; diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp index 15db4c4..40bb150 100644 --- a/StateHandler/src/StateHandler.cpp +++ b/StateHandler/src/StateHandler.cpp @@ -124,6 +124,7 @@ StateHandler::stateManual (const Event &event) handleControlButtons (event.button); break; case Event::eTick: + displaySet (getSetSpeed (), event.pressure); break; } } @@ -142,6 +143,7 @@ StateHandler::stateAuto (const Event &event) handleControlButtons (event.button); break; case Event::eTick: + displaySet (getSetPressure (), event.pressure); break; } } diff --git a/esp-vent-main/src/esp-vent-main.cpp b/esp-vent-main/src/esp-vent-main.cpp index 8bfcb9c..aa6a5d4 100644 --- a/esp-vent-main/src/esp-vent-main.cpp +++ b/esp-vent-main/src/esp-vent-main.cpp @@ -48,6 +48,8 @@ main (void) StateHandler ventMachine; + int16_t pressure = 1; + while (1) { if (b_up.read ()) @@ -77,7 +79,7 @@ main (void) * TODO: * - Update current pressure to eTick */ - ventMachine.HandleState (Event (Event::eTick)); + ventMachine.HandleState (Event (Event::eTick, pressure)); } return 0;