From bd2f6b32f15aa43f5fa7e07e55d9b9e4efbf3bd9 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Tue, 2 May 2023 11:14:47 +0300 Subject: [PATCH] menu: [#25] fix warnings and add assertions --- source/shoh/src/threads/manager/Manager.cpp | 1 + source/shoh/src/threads/manager/Manager.h | 1 + source/shoh/src/threads/manager/Menu.cpp | 16 +++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp index f5cb4a3..9d33288 100644 --- a/source/shoh/src/threads/manager/Manager.cpp +++ b/source/shoh/src/threads/manager/Manager.cpp @@ -33,6 +33,7 @@ Event::EventPair Manager::parseEvent(Event* e) return p; } } + } void Manager::taskFunction() diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h index 805d5af..bf93e5f 100644 --- a/source/shoh/src/threads/manager/Manager.h +++ b/source/shoh/src/threads/manager/Manager.h @@ -23,6 +23,7 @@ private: Event::EventPair parseEvent(Event* e); ThreadCommon::QueueManager* _qm; Counter set_point; + Menu* _menu; EventRawData int_temp; EventRawData ext_temp; diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp index e4607b2..3a89b20 100644 --- a/source/shoh/src/threads/manager/Menu.cpp +++ b/source/shoh/src/threads/manager/Menu.cpp @@ -6,6 +6,7 @@ */ #include "Menu.h" +#include Menu::Menu() { @@ -28,29 +29,34 @@ void Menu::HandleEventPair (Event::EventPair *ep) switch(static_cast(ep->rd)/*RawData*/) { case ThreadCommon::RotaryAction::Right: - this->HandleObj(MenuObjEvent::eRollClockWise); + this->HandleObj(MenuObjEvent (MenuObjEvent::eRollClockWise)); break; case ThreadCommon::RotaryAction::Left: - this->HandleObj(MenuObjEvent::eRollCClockWise); + this->HandleObj(MenuObjEvent (MenuObjEvent::eRollCClockWise)); break; case ThreadCommon::RotaryAction::Press: - this->HandleObj(MenuObjEvent::eClick); + this->HandleObj(MenuObjEvent (MenuObjEvent::eClick)); break; case ThreadCommon::RotaryAction::Idle: /*I guess this is left for debugging purposes ;D*/ + this->HandleObj(MenuObjEvent (MenuObjEvent::eRefresh)); break; - case default: + default: + assert(0); /* Pretty damn bad code if reached here */ break; } break; case Event::InternalTemp: // TODO + assert(0); break; case Event::ExternalTemp: // TODO + assert(0); break; - case default: + default: + assert(0); /* Manager has big issues... */ break; }