From 203cc037554fe86621d1d5077ed95c49e40e0119 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Sun, 16 Oct 2022 11:20:58 +0300 Subject: [PATCH] event: fix ambigouis constructor issue --- StateHandler/inc/Event.h | 7 ++----- StateHandler/src/StateHandler.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/StateHandler/inc/Event.h b/StateHandler/inc/Event.h index 4e273a6..3ce20fb 100644 --- a/StateHandler/inc/Event.h +++ b/StateHandler/inc/Event.h @@ -25,12 +25,9 @@ public: /** Time event */ eTick }; - Event (eventType e = eTick, uint8_t b = 0) : type (e), button (b){}; - Event (eventType e = eTick, int16_t pres = 0) : type (e), pressure (pres){}; + Event (eventType e = eTick, int val = 0) : type (e), value (val){}; eventType type; - uint8_t button; - int16_t pressure; - int temp; + int value; }; #endif /* EVENT_H_ */ diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp index 1fcf13d..618f562 100644 --- a/StateHandler/src/StateHandler.cpp +++ b/StateHandler/src/StateHandler.cpp @@ -81,7 +81,7 @@ StateHandler::stateInit (const Event &event) _lcd->clear (); break; case Event::eKey: - handleControlButtons (event.button); + handleControlButtons (event.value); break; case Event::eTick: if (current_mode == MANUAL) @@ -107,10 +107,10 @@ StateHandler::stateManual (const Event &event) _lcd->clear (); break; case Event::eKey: - handleControlButtons (event.button); + handleControlButtons (event.value); break; case Event::eTick: - displaySet (getSetSpeed (), event.pressure); + displaySet (getSetSpeed (), event.value); break; } } @@ -126,10 +126,10 @@ StateHandler::stateAuto (const Event &event) _lcd->clear (); break; case Event::eKey: - handleControlButtons (event.button); + handleControlButtons (event.value); break; case Event::eTick: - displaySet (getSetPressure (), event.pressure); + displaySet (getSetPressure (), event.value); break; } }