diff options
Diffstat (limited to 'ButtonHandler')
| -rw-r--r-- | ButtonHandler/ButtonHandler.cpp | 8 | ||||
| -rw-r--r-- | ButtonHandler/ButtonHandler.h | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ButtonHandler/ButtonHandler.cpp b/ButtonHandler/ButtonHandler.cpp index c49283e..ccbccfa 100644 --- a/ButtonHandler/ButtonHandler.cpp +++ b/ButtonHandler/ButtonHandler.cpp @@ -38,7 +38,7 @@ void worker(void const* argument) { b->_sw1_time = b->_sw1_timer.read_ms(); if (b->_sw1_time > b->_debounce_time) { - b->_event = sw1_press; + b->_event = ButtonHandler::sw1_press; osSignalSet(b->_main, buttonSignal); } } @@ -59,7 +59,7 @@ void worker(void const* argument) { b->_sw2_time = b->_sw2_timer.read_ms(); if (b->_sw2_time > b->_debounce_time) { - b->_event = sw2_press; + b->_event = ButtonHandler::sw2_press; osSignalSet(b->_main, buttonSignal); } } @@ -75,7 +75,7 @@ void worker(void const* argument) { check_sw1 = false; b->_sw1_running = false; b->_sw1_timer.stop(); - b->_event = sw1_hold; + b->_event = ButtonHandler::sw1_hold; osSignalSet(b->_main, buttonSignal); } } @@ -104,7 +104,7 @@ ButtonHandler::ButtonHandler(osThreadId main) _sw2.mode(PullUp); } -ButtonEvent ButtonHandler::getButtonEvent() { +ButtonHandler::ButtonEvent ButtonHandler::getButtonEvent() { ButtonEvent event = _event; _event = none; return event; diff --git a/ButtonHandler/ButtonHandler.h b/ButtonHandler/ButtonHandler.h index 57f768d..00898c6 100644 --- a/ButtonHandler/ButtonHandler.h +++ b/ButtonHandler/ButtonHandler.h @@ -6,15 +6,15 @@ #define buttonSignal (uint32_t)0x01 -typedef enum { - none = 0, - sw1_press, - sw1_hold, - sw2_press -} ButtonEvent; - class ButtonHandler { public: + typedef enum { + none = 0, + sw1_press, + sw1_hold, + sw2_press + } ButtonEvent; + ButtonHandler(osThreadId main); ~ButtonHandler(); |