From ddc9be976aa1459c9adad242b6e158623f951dbe Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 29 Apr 2023 06:32:52 +0300
Subject: [PATCH 01/18] manager: [#25] init simple task

---
 source/shoh/.cproject                       |  1 +
 source/shoh/src/main.cpp                    |  4 +++
 source/shoh/src/threads/manager/Manager.cpp | 34 +++++++++++++++++++++
 source/shoh/src/threads/manager/Manager.h   | 26 ++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 source/shoh/src/threads/manager/Manager.cpp
 create mode 100644 source/shoh/src/threads/manager/Manager.h

diff --git a/source/shoh/.cproject b/source/shoh/.cproject
index c20b11d..b1e8833 100644
--- a/source/shoh/.cproject
+++ b/source/shoh/.cproject
@@ -51,6 +51,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/rotary}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/manager}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
 								</option>
 								<option id="com.crt.advproject.cpp.misc.dialect.4036734" name="Language standard" superClass="com.crt.advproject.cpp.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.cpp17" valueType="enumerated"/>
diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp
index d374f52..579acae 100644
--- a/source/shoh/src/main.cpp
+++ b/source/shoh/src/main.cpp
@@ -8,6 +8,7 @@
 #include "Rotary.h"
 #include "retarget_uart.h"
 #include "LiquidCrystal.h"
+#include "Manager.h"
 
 void lcd_starting();
 
@@ -32,6 +33,9 @@ int main(void)
   manager->createTask(master_thread, "master",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
                       static_cast<void*>(qmanager));
+  manager->createTask(thread_manager, "manager",
+                      configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
+                      static_cast<void*>(qmanager));
   manager->createTask(rotary_thread, "rotary",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
                       static_cast<void*>(qmanager));
diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
new file mode 100644
index 0000000..b1f2b2d
--- /dev/null
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -0,0 +1,34 @@
+/*
+ * Manager.cpp
+ *
+ *  Created on: 29 Apr 2023
+ *      Author: dave
+ */
+
+#include "Manager.h"
+#include "ThreadCommon.h"
+
+Manager::Manager(ThreadCommon::QueueManager* qm) : _qm(qm)
+{
+	// TODO Auto-generated constructor stub
+
+}
+
+Manager::~Manager() 
+{
+	// TODO Auto-generated destructor stub
+}
+
+void Manager::taskFunction()
+{
+	for(;;)
+	{
+		vTaskDelay(1);
+	}
+}
+
+void thread_manager(void* pvParams)
+{
+	Manager m(static_cast<ThreadCommon::QueueManager*>(pvParams));
+	m.taskFunction();
+}
\ No newline at end of file
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
new file mode 100644
index 0000000..f214a04
--- /dev/null
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -0,0 +1,26 @@
+/*
+ * Manager.h
+ *
+ *  Created on: 29 Apr 2023
+ *      Author: dave
+ */
+
+#ifndef THREADS_MANAGER_MANAGER_H_
+#define THREADS_MANAGER_MANAGER_H_
+
+#include "ThreadCommon.h"
+#include "Event.h"
+
+class Manager {
+public:
+	Manager(ThreadCommon::QueueManager* qm);
+	virtual ~Manager();
+	void taskFunction();
+private:
+	Event* message;
+	ThreadCommon::QueueManager* _qm;
+};
+
+void thread_manager(void* pvParams);
+
+#endif /* THREADS_MANAGER_MANAGER_H_ */

From e003820710bdfee455ea24cac170091d6c5250f3 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 29 Apr 2023 06:41:41 +0300
Subject: [PATCH 02/18] manager: [#25] listen on master

---
 source/shoh/src/main.cpp                    | 4 ++++
 source/shoh/src/threads/manager/Manager.cpp | 3 ++-
 source/shoh/src/threads/manager/Manager.h   | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp
index 579acae..7b04fab 100644
--- a/source/shoh/src/main.cpp
+++ b/source/shoh/src/main.cpp
@@ -29,6 +29,10 @@ int main(void)
   qmanager->createQueue(100,
                         sizeof(Event),
                         ThreadCommon::QueueManager::master_event_all);
+  qmanager->createQueue(20,
+                        sizeof(Event),
+                        ThreadCommon::QueueManager::manager_event_master);
+  
   //Creating tasks
   manager->createTask(master_thread, "master",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index b1f2b2d..6490dc5 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -21,9 +21,10 @@ Manager::~Manager()
 
 void Manager::taskFunction()
 {
+	Event data(Event::Null, 0);
 	for(;;)
 	{
-		vTaskDelay(1);
+		_qm->receive<Event>(ThreadCommon::QueueManager::manager_event_master, &data, portMAX_DELAY);
 	}
 }
 
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index f214a04..1516073 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -17,7 +17,6 @@ public:
 	virtual ~Manager();
 	void taskFunction();
 private:
-	Event* message;
 	ThreadCommon::QueueManager* _qm;
 };
 

From df04fc910723ccb5a86596be00e8dccc8bba5257 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 29 Apr 2023 08:13:13 +0300
Subject: [PATCH 03/18] shoh: rename threads according to thread-name

---
 source/shoh/src/main.cpp                  | 6 +++---
 source/shoh/src/threads/master/Master.cpp | 2 +-
 source/shoh/src/threads/master/Master.h   | 2 +-
 source/shoh/src/threads/rotary/Rotary.cpp | 2 +-
 source/shoh/src/threads/rotary/Rotary.h   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp
index 7b04fab..7104c1e 100644
--- a/source/shoh/src/main.cpp
+++ b/source/shoh/src/main.cpp
@@ -32,15 +32,15 @@ int main(void)
   qmanager->createQueue(20,
                         sizeof(Event),
                         ThreadCommon::QueueManager::manager_event_master);
-  
+
   //Creating tasks
-  manager->createTask(master_thread, "master",
+  manager->createTask(thread_master, "master",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
                       static_cast<void*>(qmanager));
   manager->createTask(thread_manager, "manager",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
                       static_cast<void*>(qmanager));
-  manager->createTask(rotary_thread, "rotary",
+  manager->createTask(thread_rotary, "rotary",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
                       static_cast<void*>(qmanager));
   
diff --git a/source/shoh/src/threads/master/Master.cpp b/source/shoh/src/threads/master/Master.cpp
index c7cea1c..76acb12 100644
--- a/source/shoh/src/threads/master/Master.cpp
+++ b/source/shoh/src/threads/master/Master.cpp
@@ -41,7 +41,7 @@ void Master::taskFunction() {
 }
 
 
-void master_thread(void* pvParams) {
+void thread_master(void* pvParams) {
 	Master m(static_cast<ThreadCommon::QueueManager*>(pvParams));
 	m.taskFunction();
 }
diff --git a/source/shoh/src/threads/master/Master.h b/source/shoh/src/threads/master/Master.h
index e5dceae..3a5e790 100644
--- a/source/shoh/src/threads/master/Master.h
+++ b/source/shoh/src/threads/master/Master.h
@@ -26,7 +26,7 @@ private:
 	ThreadCommon::QueueManager* _qm;
 };
 
-void master_thread(void* pvParams);
+void thread_master(void* pvParams);
 
 
 #endif /* THREADS_MASTER_MASTER_H_ */
diff --git a/source/shoh/src/threads/rotary/Rotary.cpp b/source/shoh/src/threads/rotary/Rotary.cpp
index da1d8ed..eb9f19d 100644
--- a/source/shoh/src/threads/rotary/Rotary.cpp
+++ b/source/shoh/src/threads/rotary/Rotary.cpp
@@ -64,7 +64,7 @@ void Rotary::taskFunction()
 	}
 }
 
-void rotary_thread(void* pvParams)
+void thread_rotary(void* pvParams)
 {
 	// Special case for ISR
 	QueueHandle_t rotary_isr_q = xQueueCreate(15, sizeof(char));
diff --git a/source/shoh/src/threads/rotary/Rotary.h b/source/shoh/src/threads/rotary/Rotary.h
index 56fdf17..dafe910 100644
--- a/source/shoh/src/threads/rotary/Rotary.h
+++ b/source/shoh/src/threads/rotary/Rotary.h
@@ -25,6 +25,6 @@ private:
                                { 1, 8, true, false, false, true, PIN_INT2_IRQn} };
 };
 
-void rotary_thread(void* pvParams);
+void thread_rotary(void* pvParams);
 
 #endif /* THREADS_ROTARY_ROTARY_H_ */

From a2b07be73b409716d9376d4507f37fb02b020cf1 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 29 Apr 2023 08:58:34 +0300
Subject: [PATCH 04/18] manager: [#25] add Event parser

---
 source/shoh/src/threads/common/Event.h      |  6 ++++++
 source/shoh/src/threads/manager/Manager.cpp | 24 ++++++++++++++++++---
 source/shoh/src/threads/manager/Manager.h   |  8 +++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/source/shoh/src/threads/common/Event.h b/source/shoh/src/threads/common/Event.h
index 5577b00..87b535c 100644
--- a/source/shoh/src/threads/common/Event.h
+++ b/source/shoh/src/threads/common/Event.h
@@ -26,6 +26,12 @@ public:
             SetPoint
         };
 
+    typedef struct _EventPair 
+    {
+        EventRawData rd;
+        EventType et;
+    } EventPair;
+
     Event(Event::EventType type, EventRawData data)
     {
         events.insert({type, data});
diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index 6490dc5..efea320 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -8,10 +8,10 @@
 #include "Manager.h"
 #include "ThreadCommon.h"
 
-Manager::Manager(ThreadCommon::QueueManager* qm) : _qm(qm)
+Manager::Manager(ThreadCommon::QueueManager* qm)
+: _qm(qm), set_point(0, 100, 5)
 {
-	// TODO Auto-generated constructor stub
-
+	set_point.setCurrent(0);
 }
 
 Manager::~Manager() 
@@ -19,12 +19,30 @@ Manager::~Manager()
 	// TODO Auto-generated destructor stub
 }
 
+Event::EventPair Manager::parseEvent(Event* e)
+{
+	EventRawData raw_data;
+	for(Event::EventType i :
+	    {Event::Rotary, Event::InternalTemp,
+		 Event::ExternalTemp})
+	{
+		raw_data = e->getDataOf(i);
+		if(raw_data != ERROR_RETURN)
+		{
+			Event::EventPair p = {raw_data, i};
+			return p; 
+		}
+	}
+}
+
 void Manager::taskFunction()
 {
 	Event data(Event::Null, 0);
+	Event::EventPair event_pair = {0, Event::EventType::Null};
 	for(;;)
 	{
 		_qm->receive<Event>(ThreadCommon::QueueManager::manager_event_master, &data, portMAX_DELAY);
+		event_pair= this->parseEvent(&data);
 	}
 }
 
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index 1516073..c3533ba 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -10,6 +10,8 @@
 
 #include "ThreadCommon.h"
 #include "Event.h"
+#include "Counter.h"
+
 
 class Manager {
 public:
@@ -17,7 +19,13 @@ public:
 	virtual ~Manager();
 	void taskFunction();
 private:
+	Event::EventPair parseEvent(Event* e);
 	ThreadCommon::QueueManager* _qm;
+	Counter<EventRawData> set_point;
+
+	EventRawData int_temp;
+	EventRawData ext_temp;
+	EventRawData rotary_action;
 };
 
 void thread_manager(void* pvParams);

From df6411c76b00863499d693e9a1fe2b590216d3fe Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 29 Apr 2023 10:09:20 +0300
Subject: [PATCH 05/18] manager: [#25] add Counter template for set_point

---
 source/shoh/src/threads/manager/Counter.h | 102 ++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 source/shoh/src/threads/manager/Counter.h

diff --git a/source/shoh/src/threads/manager/Counter.h b/source/shoh/src/threads/manager/Counter.h
new file mode 100644
index 0000000..8efb2fc
--- /dev/null
+++ b/source/shoh/src/threads/manager/Counter.h
@@ -0,0 +1,102 @@
+/*
+ * Counter.h
+ *
+ *  Created on: Sep 1, 2022
+ *      Author: tylen
+ */
+
+#ifndef COUNTER_H_
+#define COUNTER_H_
+
+#include "chip.h"
+
+template <class CounterDataType> class Counter
+{
+
+public:
+  Counter (CounterDataType lower_boundary, CounterDataType upper_boundary,
+           CounterDataType step);
+  void inc ();
+  void dec ();
+  CounterDataType getCurrent ();
+  void setCurrent (CounterDataType num);
+  ~Counter () = default;
+
+private:
+  CounterDataType init;
+  CounterDataType up_lim;
+  CounterDataType down_lim;
+  CounterDataType _step;
+};
+
+
+template <class CounterDataType>
+void
+Counter<CounterDataType>::inc ()
+{
+  if ((init + _step) <= up_lim)
+    {
+      init += _step;
+    }
+}
+
+template <class CounterDataType>
+void
+Counter<CounterDataType>::dec ()
+{
+  if (init - _step >= down_lim)
+    {
+      init -= _step;
+    }
+}
+
+template <class CounterDataType>
+CounterDataType
+Counter<CounterDataType>::getCurrent ()
+{
+  return this->init;
+}
+
+template <class CounterDataType>
+Counter<CounterDataType>::Counter (CounterDataType lower_boundary,
+                                   CounterDataType upper_boundary,
+                                   CounterDataType step)
+{
+  up_lim = upper_boundary;
+  down_lim = lower_boundary;
+  _step = step;
+  if (down_lim > up_lim)
+    {
+      init = up_lim;
+    }
+  else if (down_lim < 0)
+    {
+      init = 0;
+    }
+  else
+    {
+      init = down_lim;
+    }
+}
+
+template <class CounterDataType>
+void
+Counter<CounterDataType>::setCurrent (CounterDataType num)
+{
+  if (num > up_lim)
+    {
+      init = up_lim;
+    }
+  else if (num < down_lim)
+    {
+      init = down_lim;
+    }
+  else
+    {
+      init = num;
+    }
+}
+
+
+
+#endif /* COUNTER_H_ */
\ No newline at end of file

From 01855e2f529939e7907c22e06b5499f0fb0d987e Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 29 Apr 2023 10:17:55 +0300
Subject: [PATCH 06/18] manager: [#25] menu class init

---
 source/shoh/src/threads/manager/Menu.cpp      | 37 +++++++++++++++++++
 source/shoh/src/threads/manager/Menu.h        | 34 +++++++++++++++++
 .../shoh/src/threads/manager/MenuObjEvent.h   | 37 +++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 source/shoh/src/threads/manager/Menu.cpp
 create mode 100644 source/shoh/src/threads/manager/Menu.h
 create mode 100644 source/shoh/src/threads/manager/MenuObjEvent.h

diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
new file mode 100644
index 0000000..23a4edc
--- /dev/null
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -0,0 +1,37 @@
+/*
+ * Menu.cpp
+ *
+ *  Created on: 29 Apr 2023
+ *      Author: dave
+ */
+
+#include "Menu.h"
+
+Menu::Menu() 
+{
+	// TODO Auto-generated constructor stub
+
+}
+
+Menu::~Menu() 
+{
+	// TODO Auto-generated destructor stub
+}
+
+void Menu::HandleEventPair (Event::EventPair *ep)
+{
+	return;
+}
+
+void Menu::SetEvent (obj_pointer newevent)
+{
+	(this->*current) (MenuObjEvent (MenuObjEvent::eUnFocus));
+	current = newevent;
+	(this->*current) (MenuObjEvent (MenuObjEvent::eFocus));
+}
+
+void Menu::HandleObj (const MenuObjEvent &event)
+{
+	(this->*current) (event);
+}
+
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
new file mode 100644
index 0000000..ef432d4
--- /dev/null
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -0,0 +1,34 @@
+/*
+ * Menu.h
+ *
+ *  Created on: 29 Apr 2023
+ *      Author: dave
+ */
+
+#include "Counter.h"
+#include "MenuObjEvent.h"
+#include "ThreadCommon.h"
+#include "Event.h"
+
+#ifndef THREADS_MANAGER_MENU_H_
+#define THREADS_MANAGER_MENU_H_
+
+class Menu;
+typedef void (Menu::*obj_pointer) (const MenuObjEvent &);
+
+class Menu
+{
+public:
+  Menu ();
+  virtual ~Menu ();
+  void HandleEventPair (Event::EventPair *ep);
+
+private:
+  /* Variables and objects */
+  obj_pointer current;
+  /* Methods */
+  void SetEvent (obj_pointer newevent);
+  void HandleObj (const MenuObjEvent &event);
+};
+
+#endif /* THREADS_MANAGER_MENU_H_ */
diff --git a/source/shoh/src/threads/manager/MenuObjEvent.h b/source/shoh/src/threads/manager/MenuObjEvent.h
new file mode 100644
index 0000000..2123817
--- /dev/null
+++ b/source/shoh/src/threads/manager/MenuObjEvent.h
@@ -0,0 +1,37 @@
+/*
+ * MenuObjEvent.h
+ *
+ *  Created on: Dec 11, 2022
+ *      Author: tylen
+ */
+
+#ifndef MENU_MENUOBJEVENT_H_
+#define MENU_MENUOBJEVENT_H_
+
+class MenuObjEvent
+{
+public:
+  virtual ~MenuObjEvent (){};
+
+  enum EventType
+  {
+    /** Start of the event */
+    eFocus,
+    /** End of the event*/
+    eUnFocus,
+    /** Refresh event */
+    eRefresh,
+    /** Button toggle event type */
+    eClick,
+    /** Rotary clockwise */
+    eRollClockWise,
+    /** Rotary counter clockwise */
+    eRollCClockWise,
+  };
+  MenuObjEvent (EventType e = eFocus) : type (e){};
+  EventType type;
+};
+
+
+
+#endif /* MENU_MENUOBJEVENT_H_ */

From 83de15ce5b0a65273d87b0fd2b2e9ee14af78338 Mon Sep 17 00:00:00 2001
From: vas-dav <vasilydavydovmail@yahoo.com>
Date: Sun, 30 Apr 2023 23:00:02 +0300
Subject: [PATCH 07/18] menu: [#25] handle eventpair with rotary

---
 source/shoh/src/threads/manager/Manager.cpp | 10 +++---
 source/shoh/src/threads/manager/Manager.h   |  3 +-
 source/shoh/src/threads/manager/Menu.cpp    | 34 +++++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index efea320..f5cb4a3 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -8,8 +8,8 @@
 #include "Manager.h"
 #include "ThreadCommon.h"
 
-Manager::Manager(ThreadCommon::QueueManager* qm)
-: _qm(qm), set_point(0, 100, 5)
+Manager::Manager(ThreadCommon::QueueManager* qm, Menu * menu)
+: _qm(qm), _menu(menu), set_point(0, 100, 5)
 {
 	set_point.setCurrent(0);
 }
@@ -43,11 +43,13 @@ void Manager::taskFunction()
 	{
 		_qm->receive<Event>(ThreadCommon::QueueManager::manager_event_master, &data, portMAX_DELAY);
 		event_pair= this->parseEvent(&data);
+        _menu->HandleEventPair(&event_pair);
 	}
 }
 
 void thread_manager(void* pvParams)
 {
-	Manager m(static_cast<ThreadCommon::QueueManager*>(pvParams));
+    Menu menu;
+	Manager m(static_cast<ThreadCommon::QueueManager*>(pvParams), &menu);
 	m.taskFunction();
-}
\ No newline at end of file
+}
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index c3533ba..805d5af 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -11,11 +11,12 @@
 #include "ThreadCommon.h"
 #include "Event.h"
 #include "Counter.h"
+#include "Menu.h"
 
 
 class Manager {
 public:
-	Manager(ThreadCommon::QueueManager* qm);
+	Manager(ThreadCommon::QueueManager* qm, Menu * menu);
 	virtual ~Manager();
 	void taskFunction();
 private:
diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index 23a4edc..e4607b2 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -20,6 +20,40 @@ Menu::~Menu()
 
 void Menu::HandleEventPair (Event::EventPair *ep)
 {
+    switch(ep->et/*EventType*/)
+    {
+        case Event::Rotary:
+            // can be wrapped in a function, but this was found to be more clear solution,
+            // since we are still handling eventpair here, although nested
+            switch(static_cast<ThreadCommon::RotaryAction>(ep->rd)/*RawData*/)
+            {
+                case ThreadCommon::RotaryAction::Right:
+                    this->HandleObj(MenuObjEvent::eRollClockWise);
+                    break;
+                case ThreadCommon::RotaryAction::Left:
+                    this->HandleObj(MenuObjEvent::eRollCClockWise);
+                    break;
+                case ThreadCommon::RotaryAction::Press:
+                    this->HandleObj(MenuObjEvent::eClick);
+                    break;
+                case ThreadCommon::RotaryAction::Idle:
+                    /*I guess this is left for debugging purposes ;D*/
+                    break;
+                case default:
+                    /* Pretty damn bad code if reached here */
+                    break;
+            }
+            break;
+        case Event::InternalTemp:
+            // TODO
+            break;
+        case Event::ExternalTemp:
+            // TODO
+            break;
+        case default:
+            /* Manager has big issues... */
+            break;
+    }
 	return;
 }
 

From bd2f6b32f15aa43f5fa7e07e55d9b9e4efbf3bd9 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Tue, 2 May 2023 11:14:47 +0300
Subject: [PATCH 08/18] 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<EventRawData> 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 <assert.h>
 
 Menu::Menu() 
 {
@@ -28,29 +29,34 @@ void Menu::HandleEventPair (Event::EventPair *ep)
             switch(static_cast<ThreadCommon::RotaryAction>(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;
     }

From fad70c9f37568c89a2512af6409264a5ddc935fd Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Tue, 2 May 2023 11:24:54 +0300
Subject: [PATCH 09/18] menu: [#25] rename event to state

---
 source/shoh/src/threads/manager/Menu.cpp | 4 ++--
 source/shoh/src/threads/manager/Menu.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index 3a89b20..04f24ed 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -63,10 +63,10 @@ void Menu::HandleEventPair (Event::EventPair *ep)
 	return;
 }
 
-void Menu::SetEvent (obj_pointer newevent)
+void Menu::SetState (p_state new_state)
 {
 	(this->*current) (MenuObjEvent (MenuObjEvent::eUnFocus));
-	current = newevent;
+	current = new_state;
 	(this->*current) (MenuObjEvent (MenuObjEvent::eFocus));
 }
 
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
index ef432d4..eb89d98 100644
--- a/source/shoh/src/threads/manager/Menu.h
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -14,7 +14,7 @@
 #define THREADS_MANAGER_MENU_H_
 
 class Menu;
-typedef void (Menu::*obj_pointer) (const MenuObjEvent &);
+typedef void (Menu::*p_state) (const MenuObjEvent &);
 
 class Menu
 {
@@ -25,9 +25,9 @@ public:
 
 private:
   /* Variables and objects */
-  obj_pointer current;
+  p_state current;
   /* Methods */
-  void SetEvent (obj_pointer newevent);
+  void SetState (p_state new_state);
   void HandleObj (const MenuObjEvent &event);
 };
 

From d3f5cdebbc5c731d666035075654cd8e4d2b6342 Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Mon, 8 May 2023 13:08:01 +0300
Subject: [PATCH 10/18] menu: [#25] Made states. Moved logic to Menu.

*Menu class now is responsible for the whole logic with
temperature and set_point.
*void NotifyAndRefreshUI (const char *str) is a placeholder
for sending a string value on a queue to UI task,
which will handle the lcd screen.
*Added error return value to Manager::parseEvent(Event* e)
---
 source/shoh/src/threads/manager/Manager.cpp |   5 +-
 source/shoh/src/threads/manager/Manager.h   |   3 -
 source/shoh/src/threads/manager/Menu.cpp    | 110 ++++++++++++++++++--
 source/shoh/src/threads/manager/Menu.h      |  15 ++-
 4 files changed, 114 insertions(+), 19 deletions(-)

diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index 9d33288..b5eee38 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -9,9 +9,8 @@
 #include "ThreadCommon.h"
 
 Manager::Manager(ThreadCommon::QueueManager* qm, Menu * menu)
-: _qm(qm), _menu(menu), set_point(0, 100, 5)
+: _qm(qm), _menu(menu)
 {
-	set_point.setCurrent(0);
 }
 
 Manager::~Manager() 
@@ -33,7 +32,7 @@ Event::EventPair Manager::parseEvent(Event* e)
 			return p; 
 		}
 	}
-	
+	return {ERROR_RETURN, Event::Null};
 }
 
 void Manager::taskFunction()
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index bf93e5f..8ab2884 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -22,11 +22,8 @@ public:
 private:
 	Event::EventPair parseEvent(Event* e);
 	ThreadCommon::QueueManager* _qm;
-	Counter<EventRawData> set_point;
 	Menu* _menu;
 
-	EventRawData int_temp;
-	EventRawData ext_temp;
 	EventRawData rotary_action;
 };
 
diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index 04f24ed..2b15825 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -8,15 +8,16 @@
 #include "Menu.h"
 #include <assert.h>
 
-Menu::Menu() 
+Menu::Menu(): current(&Menu::sInitView), set_point(0, 100, 1),
+main_text     ("CURRENT %2d      DESIRED %2d      "),
+set_point_text("CURRENT %2d      DESIRED[%2d]     ")
 {
-	// TODO Auto-generated constructor stub
-
+	this->SetState(&Menu::sInitView);
+    set_point.setCurrent(0);
 }
 
 Menu::~Menu() 
 {
-	// TODO Auto-generated destructor stub
 }
 
 void Menu::HandleEventPair (Event::EventPair *ep)
@@ -47,13 +48,11 @@ void Menu::HandleEventPair (Event::EventPair *ep)
                     break;
             }
             break;
-        case Event::InternalTemp:
-            // TODO
-            assert(0);
-            break;
         case Event::ExternalTemp:
-            // TODO
-            assert(0);
+            //Change ExternalTemp value.
+            this->ext_temp = ep->rd;
+            //Refresh the menu screen.
+            this->HandleObj(MenuObjEvent (MenuObjEvent::eRefresh));
             break;
         default:
             assert(0);
@@ -63,6 +62,93 @@ void Menu::HandleEventPair (Event::EventPair *ep)
 	return;
 }
 
+/* States */
+void Menu::sInitView(const MenuObjEvent &e)
+{
+    switch (e.type)
+    {
+    case MenuObjEvent::eFocus:
+        this->NotifyAndRefreshUI("Loading...");
+        break;
+    case MenuObjEvent::eUnFocus:
+        this->NotifyAndRefreshUI("");
+        break;
+    case MenuObjEvent::eRollClockWise:
+        break;
+    case MenuObjEvent::eRollCClockWise:
+        break;
+    case MenuObjEvent::eClick:
+        break;
+    case MenuObjEvent::eRefresh:
+        this->SetState(&Menu::sMainView);
+        break;
+    default:
+        break;
+    }
+}
+
+void Menu::sMainView(const MenuObjEvent &e)
+{
+    char screen_text[64];
+    switch (e.type)
+    {
+    case MenuObjEvent::eFocus: 
+        sprintf(screen_text, main_text, this->ext_temp, this->set_point.getCurrent());
+        this->NotifyAndRefreshUI(screen_text);
+        break;
+    case MenuObjEvent::eUnFocus:
+        this->NotifyAndRefreshUI("");
+        break;
+    case MenuObjEvent::eRollClockWise:
+        break;
+    case MenuObjEvent::eRollCClockWise:
+        break;
+    case MenuObjEvent::eClick:
+        this->SetState(&Menu::sSetPointMod);
+        break;
+    case MenuObjEvent::eRefresh:
+        sprintf(screen_text, main_text, this->ext_temp, this->set_point.getCurrent());
+        this->NotifyAndRefreshUI(screen_text);
+        break;
+    default:
+        break;
+    }
+}
+
+void Menu::sSetPointMod(const MenuObjEvent &e)
+{
+    char screen_text[64];
+    switch (e.type)
+    {
+    case MenuObjEvent::eFocus:
+        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        this->NotifyAndRefreshUI(screen_text);
+        break;
+    case MenuObjEvent::eUnFocus:
+        this->NotifyAndRefreshUI("");
+        break;
+    case MenuObjEvent::eRollClockWise:
+        set_point.inc();
+        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        this->NotifyAndRefreshUI(screen_text);
+        break;
+    case MenuObjEvent::eRollCClockWise:
+        set_point.dec();
+        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        this->NotifyAndRefreshUI(screen_text);
+        break;
+    case MenuObjEvent::eClick:
+        this->SetState(&Menu::sMainView);
+        break;
+    case MenuObjEvent::eRefresh:
+        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        this->NotifyAndRefreshUI(screen_text);
+        break;
+    default:
+        break;
+    }
+}
+
 void Menu::SetState (p_state new_state)
 {
 	(this->*current) (MenuObjEvent (MenuObjEvent::eUnFocus));
@@ -75,3 +161,7 @@ void Menu::HandleObj (const MenuObjEvent &event)
 	(this->*current) (event);
 }
 
+void Menu::NotifyAndRefreshUI (const char *str)
+{
+    //Send string on a queue to UI task.
+}
\ No newline at end of file
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
index eb89d98..a8a3d7f 100644
--- a/source/shoh/src/threads/manager/Menu.h
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -5,14 +5,14 @@
  *      Author: dave
  */
 
+#ifndef THREADS_MANAGER_MENU_H_
+#define THREADS_MANAGER_MENU_H_
+
 #include "Counter.h"
 #include "MenuObjEvent.h"
 #include "ThreadCommon.h"
 #include "Event.h"
 
-#ifndef THREADS_MANAGER_MENU_H_
-#define THREADS_MANAGER_MENU_H_
-
 class Menu;
 typedef void (Menu::*p_state) (const MenuObjEvent &);
 
@@ -26,9 +26,18 @@ public:
 private:
   /* Variables and objects */
   p_state current;
+  int ext_temp;
+  Counter<EventRawData> set_point;
+  const char main_text[64];
+  const char set_point_text[64];
+  /* States */
+  void sInitView(const MenuObjEvent &e);
+  void sMainView(const MenuObjEvent &e);
+  void sSetPointMod(const MenuObjEvent &e);
   /* Methods */
   void SetState (p_state new_state);
   void HandleObj (const MenuObjEvent &event);
+  void NotifyAndRefreshUI (const char *str);
 };
 
 #endif /* THREADS_MANAGER_MENU_H_ */

From 20fe16b46e145930410014cbc055e42567995903 Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Mon, 8 May 2023 15:35:16 +0300
Subject: [PATCH 11/18] UI: [#35] Added UserInterface task.

---
 source/shoh/.cproject                         |   6 +
 source/shoh/src/main.cpp                      |  56 ++-------
 source/shoh/src/threads/common/Event.h        |   3 +-
 .../threads/user_interface/UserInterface.cpp  | 114 ++++++++++++++++++
 .../threads/user_interface/UserInterface.h    |  55 +++++++++
 5 files changed, 186 insertions(+), 48 deletions(-)
 create mode 100644 source/shoh/src/threads/user_interface/UserInterface.cpp
 create mode 100644 source/shoh/src/threads/user_interface/UserInterface.h

diff --git a/source/shoh/.cproject b/source/shoh/.cproject
index b1e8833..ff20bcd 100644
--- a/source/shoh/.cproject
+++ b/source/shoh/.cproject
@@ -50,6 +50,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/rotary}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/manager}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
@@ -83,6 +84,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
 								</option>
 								<option id="com.crt.advproject.c.misc.dialect.82852045" name="Language standard" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.c17" valueType="enumerated"/>
@@ -102,6 +104,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/master}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1836378919" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
@@ -200,6 +203,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/FreeRTOSCPP}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
 								</option>
 								<inputType id="com.crt.advproject.compiler.cpp.input.903614193" superClass="com.crt.advproject.compiler.cpp.input"/>
 							</tool>
@@ -229,6 +233,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/FreeRTOSCPP}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
 								</option>
 								<option id="com.crt.advproject.c.misc.dialect.1008527937" name="Language standard" superClass="com.crt.advproject.c.misc.dialect" useByScannerDiscovery="true" value="com.crt.advproject.misc.dialect.c17" valueType="enumerated"/>
 								<inputType id="com.crt.advproject.compiler.input.246185412" superClass="com.crt.advproject.compiler.input"/>
@@ -249,6 +254,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/peripherals}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/FreeRTOSCPP}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/common}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/src/threads/user_interface}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1117166373" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 								<inputType id="com.crt.advproject.assembler.input.2071009798" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>
diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp
index 7104c1e..4bb8f6e 100644
--- a/source/shoh/src/main.cpp
+++ b/source/shoh/src/main.cpp
@@ -3,14 +3,13 @@
 #include "FreeRTOS.h"
 #include "task.h"
 #include <cr_section_macros.h>
+#include "retarget_uart.h"
+
 #include "ThreadCommon.h"
 #include "Master.h"
 #include "Rotary.h"
-#include "retarget_uart.h"
-#include "LiquidCrystal.h"
 #include "Manager.h"
-
-void lcd_starting();
+#include "UserInterface.h"
 
 int main(void)
 {
@@ -20,8 +19,6 @@ int main(void)
   retarget_init();
 
   printf("Hello there!\r\n");
-  
-  lcd_starting();
 
   ThreadCommon::ThreadManager* manager = new ThreadCommon::ThreadManager;
   ThreadCommon::QueueManager* qmanager = new ThreadCommon::QueueManager;
@@ -32,6 +29,9 @@ int main(void)
   qmanager->createQueue(20,
                         sizeof(Event),
                         ThreadCommon::QueueManager::manager_event_master);
+  qmanager->createQueue(20,
+                        sizeof(Event),
+                        ThreadCommon::QueueManager::ui_event_manager);
 
   //Creating tasks
   manager->createTask(thread_master, "master",
@@ -43,50 +43,12 @@ int main(void)
   manager->createTask(thread_rotary, "rotary",
                       configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
                       static_cast<void*>(qmanager));
+  manager->createTask(thread_user_interface, "user_interface",
+                      configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
+                      static_cast<void*>(qmanager));
   
   // Start the real time kernel with preemption.
   vTaskStartScheduler ();
 
   return 1;
 }
-
-/**
- * @brief While we don't have UI, this should do for LCD.
- * 
- */
-void lcd_starting() {
-  // LCD pins init.
-  //Well, this lpc is a bit different with those. Table 83 from UM10732-11u68.pdf
-  DigitalIoPin *rs = new DigitalIoPin(1, 9, false);
-  Chip_IOCON_PinMuxSet (LPC_IOCON, 1, 9, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
-  DigitalIoPin *en = new DigitalIoPin(0, 14, false);
-  Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 14, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
-  DigitalIoPin *d4 = new DigitalIoPin(0, 13, false);
-  Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 13, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
-  DigitalIoPin *d5 = new DigitalIoPin(0, 12, false);
-  Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 12, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
-  DigitalIoPin *d6 = new DigitalIoPin(0, 23, false);
-  Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 23, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
-  DigitalIoPin *d7 = new DigitalIoPin(0, 11, false);
-  Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 11, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
-  rs->write(false);
-  en->write(false);
-  d4->write(false);
-  d5->write(false);
-  d6->write(false);
-  d7->write(false);
-  // LCD init.
-  LiquidCrystal *lcd = new LiquidCrystal(rs, en, d4, d5, d6, d7);
-  // LCD configure display geometry.
-  lcd->begin(16, 2);
-  lcd->setCursor (0, 0);
-  lcd->print("Hello there");
-  lcd->setCursor (0, 1);
-  lcd->print("Starting...");
-}
diff --git a/source/shoh/src/threads/common/Event.h b/source/shoh/src/threads/common/Event.h
index 87b535c..34a242a 100644
--- a/source/shoh/src/threads/common/Event.h
+++ b/source/shoh/src/threads/common/Event.h
@@ -23,7 +23,8 @@ public:
             Rotary,
             InternalTemp,
             ExternalTemp,
-            SetPoint
+            SetPoint,
+            NotifyUI
         };
 
     typedef struct _EventPair 
diff --git a/source/shoh/src/threads/user_interface/UserInterface.cpp b/source/shoh/src/threads/user_interface/UserInterface.cpp
new file mode 100644
index 0000000..e3dc7e1
--- /dev/null
+++ b/source/shoh/src/threads/user_interface/UserInterface.cpp
@@ -0,0 +1,114 @@
+/*
+ * UserInterface.cpp
+ *
+ *  Created on: 8 May 2023
+ */
+
+#include "UserInterface.h"
+#include <cstring>
+
+UserInterface::UserInterface(ThreadCommon::QueueManager* qm) :
+_qm(qm), lcd1(nullptr)
+{
+}
+
+UserInterface::~UserInterface()
+{
+	delete this->lcd1;
+	delete this->lcd1_rs;
+	delete this->lcd1_en;
+	delete this->lcd1_d4;
+	delete this->lcd1_d5;
+	delete this->lcd1_d6;
+	delete this->lcd1_d7;
+}
+
+void UserInterface::taskFunction()
+{
+	Event data(Event::Null, 0);
+	//LCD1 init.
+	this->initLCD(this->lcd1, this->lcd1_rs, this->lcd1_en, this->lcd1_d4,
+				  this->lcd1_d5, this->lcd1_d6, this->lcd1_d7);
+
+	for (;;)
+	{
+		this->_qm->receive(ThreadCommon::QueueManager::ui_event_manager, &data, portMAX_DELAY);
+		//Don't mind the type, we care only about the raw_data.
+		EventRawData ed = data.getDataOf(Event::NotifyUI);
+		if(ed != ERROR_RETURN)
+			this->handleEvent(reinterpret_cast<UserInterface::InterfaceWithData*>(&ed));
+		else
+			printf("ERROR: [UserInterface::taskFunction] Event gave ERROR_RETURN data.");
+	}
+	
+}
+
+void UserInterface::handleEvent(InterfaceWithData* ui_data)
+{
+	switch (ui_data->display)
+	{
+	case LCD1:
+		this->handleLCD(this->lcd1, ui_data->data.str);
+		break;
+	default:
+		//Should never happen.
+		printf("WARNING: [UserInterface::handleEvent] executed default case.");
+		break;
+	}
+}
+
+/******************************/
+/*Interface specific functions*/
+/******************************/
+
+void UserInterface::handleLCD(LiquidCrystal *lcd, const char *str)
+{
+	//Interpret empty string as clear.
+	if(!strlen(str))
+		lcd->clear();
+	//Print the text otherwise.
+	else
+	{
+		lcd->setCursor(0, 0);
+		lcd->print(str);
+	}
+}
+
+void UserInterface::initLCD(LiquidCrystal *lcd,
+				 			DigitalIoPin *rs, DigitalIoPin *en,
+				 			DigitalIoPin *d4, DigitalIoPin *d5,
+				 			DigitalIoPin *d6, DigitalIoPin *d7)
+{
+	rs = new DigitalIoPin(1, 9, false);
+	en = new DigitalIoPin(0, 14, false);
+	d4 = new DigitalIoPin(0, 13, false);
+	d5 = new DigitalIoPin(0, 12, false);
+	d6 = new DigitalIoPin(0, 23, false);
+	d7 = new DigitalIoPin(0, 11, false);
+
+	//Fix Pin Muxing.
+	Chip_IOCON_PinMuxSet (LPC_IOCON, 1, 9, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
+	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 14, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
+	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 13, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
+	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 12, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
+	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 23, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
+	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 11, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
+
+	rs->write(false);
+	en->write(false);
+	d4->write(false);
+	d5->write(false);
+  	d6->write(false);
+  	d7->write(false);
+	// LCD init.
+	lcd = new LiquidCrystal(rs, en, d4, d5, d6, d7);
+	// LCD configure display geometry.
+	lcd->begin(16, 2);
+	lcd->setCursor (0, 0);
+}
+
+void thread_user_interface(void* pvParams)
+{
+	UserInterface ui(static_cast<ThreadCommon::QueueManager*>(pvParams));
+	ui.taskFunction();
+}
diff --git a/source/shoh/src/threads/user_interface/UserInterface.h b/source/shoh/src/threads/user_interface/UserInterface.h
new file mode 100644
index 0000000..1f8df5b
--- /dev/null
+++ b/source/shoh/src/threads/user_interface/UserInterface.h
@@ -0,0 +1,55 @@
+/*
+ * UserInterface.h
+ *
+ *  Created on: 8 May 2023
+ */
+
+#ifndef THREADS_USER_INTERFACE_USERINTERFACE_H_
+#define THREADS_USER_INTERFACE_USERINTERFACE_H_
+
+#include "ThreadCommon.h"
+#include "Event.h"
+#include "LiquidCrystal.h"
+
+class UserInterface {
+public:
+	UserInterface(ThreadCommon::QueueManager* qm);
+	virtual ~UserInterface();
+
+	enum Interface
+	{
+		LCD1
+	};
+
+	union InterfaceData
+	{
+		char str[64];
+	};
+
+	struct InterfaceWithData
+	{
+		Interface display;
+		InterfaceData data;
+	};
+
+	void taskFunction();
+private:
+	/* Variables */
+	ThreadCommon::QueueManager* _qm;
+	LiquidCrystal* lcd1;
+	DigitalIoPin *lcd1_rs, *lcd1_en, *lcd1_d4, *lcd1_d5, *lcd1_d6, *lcd1_d7;
+	
+	/* Methods */
+	void handleEvent(InterfaceWithData* ui_data);
+
+	//UIs
+	void handleLCD(LiquidCrystal *lcd, const char *str);
+	void initLCD(LiquidCrystal *lcd,
+				 DigitalIoPin *rs, DigitalIoPin *en,
+				 DigitalIoPin *d4, DigitalIoPin *d5,
+				 DigitalIoPin *d6, DigitalIoPin *d7);
+};
+
+void thread_user_interface(void* pvParams);
+
+#endif /* THREADS_USER_INTERFACE_USERINTERFACE_H_ */

From 052d01542505aaa8bb367264c7b1d01aa586a60b Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Mon, 8 May 2023 15:35:46 +0300
Subject: [PATCH 12/18] LiquidCrystal: Added destructor.

---
 source/shoh/src/peripherals/LiquidCrystal.cpp | 2 ++
 source/shoh/src/peripherals/LiquidCrystal.h   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/source/shoh/src/peripherals/LiquidCrystal.cpp b/source/shoh/src/peripherals/LiquidCrystal.cpp
index 2b9b636..3a7988b 100644
--- a/source/shoh/src/peripherals/LiquidCrystal.cpp
+++ b/source/shoh/src/peripherals/LiquidCrystal.cpp
@@ -104,6 +104,8 @@ LiquidCrystal::LiquidCrystal(DigitalIoPin *rs,  DigitalIoPin *enable,
   begin(16, 2); // default to 16x2 display
 }
 
+LiquidCrystal::~LiquidCrystal() {}
+
 void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
   if (lines > 1) {
     _displayfunction |= LCD_2LINE;
diff --git a/source/shoh/src/peripherals/LiquidCrystal.h b/source/shoh/src/peripherals/LiquidCrystal.h
index 6954c3a..a33fcd9 100644
--- a/source/shoh/src/peripherals/LiquidCrystal.h
+++ b/source/shoh/src/peripherals/LiquidCrystal.h
@@ -50,6 +50,8 @@ public:
   LiquidCrystal(DigitalIoPin *rs,  DigitalIoPin *enable,
 			    DigitalIoPin *d0, DigitalIoPin *d1, DigitalIoPin *d2, DigitalIoPin *d3);
 
+  virtual ~LiquidCrystal();
+
   void begin(uint8_t cols, uint8_t rows, uint8_t charsize = LCD_5x8DOTS);
 
   void clear();

From f0bbfb22abd8885529a9553b7c5c866b08abf15a Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Mon, 8 May 2023 16:08:34 +0300
Subject: [PATCH 13/18] Menu & UI: [#25, #35]Communication between these tasks.

* The code is a mess for now. I'm not sure if there is any reason to
send a whole event to UI, it's better to send InterfaceWithData.
* Sending to queue from Menu isn't great as well.
---
 source/shoh/src/threads/manager/Manager.cpp              | 9 ++++-----
 source/shoh/src/threads/manager/Manager.h                | 4 ++--
 source/shoh/src/threads/manager/Menu.cpp                 | 7 ++++++-
 source/shoh/src/threads/manager/Menu.h                   | 3 ++-
 source/shoh/src/threads/user_interface/UserInterface.cpp | 2 +-
 source/shoh/src/threads/user_interface/UserInterface.h   | 2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index b5eee38..2f4e9ca 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -8,8 +8,8 @@
 #include "Manager.h"
 #include "ThreadCommon.h"
 
-Manager::Manager(ThreadCommon::QueueManager* qm, Menu * menu)
-: _qm(qm), _menu(menu)
+Manager::Manager(ThreadCommon::QueueManager* qm)
+: _qm(qm), _menu{qm}
 {
 }
 
@@ -43,13 +43,12 @@ void Manager::taskFunction()
 	{
 		_qm->receive<Event>(ThreadCommon::QueueManager::manager_event_master, &data, portMAX_DELAY);
 		event_pair= this->parseEvent(&data);
-        _menu->HandleEventPair(&event_pair);
+        _menu.HandleEventPair(&event_pair);
 	}
 }
 
 void thread_manager(void* pvParams)
 {
-    Menu menu;
-	Manager m(static_cast<ThreadCommon::QueueManager*>(pvParams), &menu);
+	Manager m(static_cast<ThreadCommon::QueueManager*>(pvParams));
 	m.taskFunction();
 }
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index 8ab2884..7a8e844 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -16,13 +16,13 @@
 
 class Manager {
 public:
-	Manager(ThreadCommon::QueueManager* qm, Menu * menu);
+	Manager(ThreadCommon::QueueManager* qm);
 	virtual ~Manager();
 	void taskFunction();
 private:
 	Event::EventPair parseEvent(Event* e);
 	ThreadCommon::QueueManager* _qm;
-	Menu* _menu;
+	Menu _menu;
 
 	EventRawData rotary_action;
 };
diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index 2b15825..52c95d6 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -7,8 +7,10 @@
 
 #include "Menu.h"
 #include <assert.h>
+#include "UserInterface.h"
 
-Menu::Menu(): current(&Menu::sInitView), set_point(0, 100, 1),
+Menu::Menu(ThreadCommon::QueueManager* qm): _qm(qm),
+current(&Menu::sInitView), set_point(0, 100, 1),
 main_text     ("CURRENT %2d      DESIRED %2d      "),
 set_point_text("CURRENT %2d      DESIRED[%2d]     ")
 {
@@ -164,4 +166,7 @@ void Menu::HandleObj (const MenuObjEvent &event)
 void Menu::NotifyAndRefreshUI (const char *str)
 {
     //Send string on a queue to UI task.
+    UserInterface::InterfaceWithData ud = {UserInterface::LCD1, *str};
+    Event * p_e = new Event(Event::EventType::NotifyUI, *(reinterpret_cast<EventRawData*>(&ud)));
+    this->_qm->send<Event>(ThreadCommon::QueueManager::ui_event_manager, p_e, portMAX_DELAY);
 }
\ No newline at end of file
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
index a8a3d7f..bc5177d 100644
--- a/source/shoh/src/threads/manager/Menu.h
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -19,12 +19,13 @@ typedef void (Menu::*p_state) (const MenuObjEvent &);
 class Menu
 {
 public:
-  Menu ();
+  Menu (ThreadCommon::QueueManager* qm);
   virtual ~Menu ();
   void HandleEventPair (Event::EventPair *ep);
 
 private:
   /* Variables and objects */
+  ThreadCommon::QueueManager* _qm;
   p_state current;
   int ext_temp;
   Counter<EventRawData> set_point;
diff --git a/source/shoh/src/threads/user_interface/UserInterface.cpp b/source/shoh/src/threads/user_interface/UserInterface.cpp
index e3dc7e1..ebc87b4 100644
--- a/source/shoh/src/threads/user_interface/UserInterface.cpp
+++ b/source/shoh/src/threads/user_interface/UserInterface.cpp
@@ -32,7 +32,7 @@ void UserInterface::taskFunction()
 
 	for (;;)
 	{
-		this->_qm->receive(ThreadCommon::QueueManager::ui_event_manager, &data, portMAX_DELAY);
+		this->_qm->receive<Event>(ThreadCommon::QueueManager::ui_event_manager, &data, portMAX_DELAY);
 		//Don't mind the type, we care only about the raw_data.
 		EventRawData ed = data.getDataOf(Event::NotifyUI);
 		if(ed != ERROR_RETURN)
diff --git a/source/shoh/src/threads/user_interface/UserInterface.h b/source/shoh/src/threads/user_interface/UserInterface.h
index 1f8df5b..85befe5 100644
--- a/source/shoh/src/threads/user_interface/UserInterface.h
+++ b/source/shoh/src/threads/user_interface/UserInterface.h
@@ -23,7 +23,7 @@ public:
 
 	union InterfaceData
 	{
-		char str[64];
+		const char str[64];
 	};
 
 	struct InterfaceWithData

From ea1139567ab6ccc6249a4215638de8c39d899aae Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Tue, 9 May 2023 01:14:47 +0300
Subject: [PATCH 14/18] UI: [#35] Fixing issues.

*Send UserInterface::InterfaceWithData in the queue instead of Event.
*Remove pointer madness for LCD.
*Timeout for Idle Event from Master thread.
---
 source/shoh/src/main.cpp                      |  2 +-
 source/shoh/src/threads/manager/Menu.cpp      |  9 ++--
 source/shoh/src/threads/manager/Menu.h        |  2 +-
 source/shoh/src/threads/master/Master.cpp     |  9 +++-
 .../threads/user_interface/UserInterface.cpp  | 53 +++++++++----------
 .../threads/user_interface/UserInterface.h    |  7 +--
 6 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/source/shoh/src/main.cpp b/source/shoh/src/main.cpp
index 4bb8f6e..740e2b4 100644
--- a/source/shoh/src/main.cpp
+++ b/source/shoh/src/main.cpp
@@ -30,7 +30,7 @@ int main(void)
                         sizeof(Event),
                         ThreadCommon::QueueManager::manager_event_master);
   qmanager->createQueue(20,
-                        sizeof(Event),
+                        sizeof(UserInterface::InterfaceWithData),
                         ThreadCommon::QueueManager::ui_event_manager);
 
   //Creating tasks
diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index 52c95d6..ac002ae 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -82,6 +82,7 @@ void Menu::sInitView(const MenuObjEvent &e)
     case MenuObjEvent::eClick:
         break;
     case MenuObjEvent::eRefresh:
+        printf("NOTE: sInitView handled eRefresh.\n");
         this->SetState(&Menu::sMainView);
         break;
     default:
@@ -166,7 +167,7 @@ void Menu::HandleObj (const MenuObjEvent &event)
 void Menu::NotifyAndRefreshUI (const char *str)
 {
     //Send string on a queue to UI task.
-    UserInterface::InterfaceWithData ud = {UserInterface::LCD1, *str};
-    Event * p_e = new Event(Event::EventType::NotifyUI, *(reinterpret_cast<EventRawData*>(&ud)));
-    this->_qm->send<Event>(ThreadCommon::QueueManager::ui_event_manager, p_e, portMAX_DELAY);
-}
\ No newline at end of file
+    UserInterface::InterfaceWithData ud = {UserInterface::LCD1, str};
+    //Event * p_e = new Event(Event::EventType::NotifyUI, *(reinterpret_cast<EventRawData*>(&ud)));
+    this->_qm->send<UserInterface::InterfaceWithData>(ThreadCommon::QueueManager::ui_event_manager, &ud, portMAX_DELAY);
+}
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
index bc5177d..c35a1fd 100644
--- a/source/shoh/src/threads/manager/Menu.h
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -27,7 +27,7 @@ private:
   /* Variables and objects */
   ThreadCommon::QueueManager* _qm;
   p_state current;
-  int ext_temp;
+  short ext_temp;
   Counter<EventRawData> set_point;
   const char main_text[64];
   const char set_point_text[64];
diff --git a/source/shoh/src/threads/master/Master.cpp b/source/shoh/src/threads/master/Master.cpp
index 76acb12..aaf4588 100644
--- a/source/shoh/src/threads/master/Master.cpp
+++ b/source/shoh/src/threads/master/Master.cpp
@@ -16,24 +16,29 @@ void Master::taskFunction() {
 	Event data(Event::Null, 0);
 	bool LedState = true;
 	for (;;) {
-		_qm->receive<Event>(ThreadCommon::QueueManager::master_event_all, &data, portMAX_DELAY);
+		if(!_qm->receive<Event>(ThreadCommon::QueueManager::master_event_all, &data, 10000))
+			data.setDataOf(Event::Rotary, ThreadCommon::RotaryAction::Idle);
 		switch(data.getDataOf(Event::Rotary))
 		{
 			case ThreadCommon::RotaryAction::Right:
 				Board_LED_Set(ThreadCommon::RotaryAction::Right, LedState);
 				printf("Right\r\n");
+				_qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, &data, 0);
 				break;
 			case ThreadCommon::RotaryAction::Left:
 				Board_LED_Set(ThreadCommon::RotaryAction::Left, LedState);
 				printf("Left\r\n");
+				_qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, &data, 0);
 				break;
 			case ThreadCommon::RotaryAction::Press:
 				Board_LED_Set(ThreadCommon::RotaryAction::Press, LedState);
 				printf("Press\r\n");
+				_qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, &data, 0);
 				break;
 			case ThreadCommon::RotaryAction::Idle:
-				Board_LED_Set(ThreadCommon::RotaryAction::Right, LedState);
+				//Board_LED_Set(ThreadCommon::RotaryAction::Right, LedState);
 				printf("Idle\r\n");
+				_qm->send<Event>(ThreadCommon::QueueManager::manager_event_master, &data, 0);
 				break;
 		}
 		LedState = !LedState;
diff --git a/source/shoh/src/threads/user_interface/UserInterface.cpp b/source/shoh/src/threads/user_interface/UserInterface.cpp
index ebc87b4..f75634e 100644
--- a/source/shoh/src/threads/user_interface/UserInterface.cpp
+++ b/source/shoh/src/threads/user_interface/UserInterface.cpp
@@ -10,6 +10,7 @@
 UserInterface::UserInterface(ThreadCommon::QueueManager* qm) :
 _qm(qm), lcd1(nullptr)
 {
+	this->initLCD1();
 }
 
 UserInterface::~UserInterface()
@@ -26,19 +27,15 @@ UserInterface::~UserInterface()
 void UserInterface::taskFunction()
 {
 	Event data(Event::Null, 0);
-	//LCD1 init.
-	this->initLCD(this->lcd1, this->lcd1_rs, this->lcd1_en, this->lcd1_d4,
-				  this->lcd1_d5, this->lcd1_d6, this->lcd1_d7);
+	InterfaceWithData ui_with_data;
 
 	for (;;)
 	{
-		this->_qm->receive<Event>(ThreadCommon::QueueManager::ui_event_manager, &data, portMAX_DELAY);
+		this->_qm->receive<UserInterface::InterfaceWithData>(ThreadCommon::QueueManager::ui_event_manager, &ui_with_data, portMAX_DELAY);
 		//Don't mind the type, we care only about the raw_data.
-		EventRawData ed = data.getDataOf(Event::NotifyUI);
-		if(ed != ERROR_RETURN)
-			this->handleEvent(reinterpret_cast<UserInterface::InterfaceWithData*>(&ed));
-		else
-			printf("ERROR: [UserInterface::taskFunction] Event gave ERROR_RETURN data.");
+		//EventRawData ed = data.getDataOf(Event::NotifyUI);
+		//if(ed != ERROR_RETURN)
+		this->handleEvent(&ui_with_data);
 	}
 	
 }
@@ -52,7 +49,7 @@ void UserInterface::handleEvent(InterfaceWithData* ui_data)
 		break;
 	default:
 		//Should never happen.
-		printf("WARNING: [UserInterface::handleEvent] executed default case.");
+		printf("WARNING: [UserInterface::handleEvent] executed default case.\n");
 		break;
 	}
 }
@@ -74,17 +71,14 @@ void UserInterface::handleLCD(LiquidCrystal *lcd, const char *str)
 	}
 }
 
-void UserInterface::initLCD(LiquidCrystal *lcd,
-				 			DigitalIoPin *rs, DigitalIoPin *en,
-				 			DigitalIoPin *d4, DigitalIoPin *d5,
-				 			DigitalIoPin *d6, DigitalIoPin *d7)
+void UserInterface::initLCD1()
 {
-	rs = new DigitalIoPin(1, 9, false);
-	en = new DigitalIoPin(0, 14, false);
-	d4 = new DigitalIoPin(0, 13, false);
-	d5 = new DigitalIoPin(0, 12, false);
-	d6 = new DigitalIoPin(0, 23, false);
-	d7 = new DigitalIoPin(0, 11, false);
+	this->lcd1_rs = new DigitalIoPin(1, 9, false);
+	this->lcd1_en = new DigitalIoPin(0, 14, false);
+	this->lcd1_d4 = new DigitalIoPin(0, 13, false);
+	this->lcd1_d5 = new DigitalIoPin(0, 12, false);
+	this->lcd1_d6 = new DigitalIoPin(0, 23, false);
+	this->lcd1_d7 = new DigitalIoPin(0, 11, false);
 
 	//Fix Pin Muxing.
 	Chip_IOCON_PinMuxSet (LPC_IOCON, 1, 9, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
@@ -94,17 +88,18 @@ void UserInterface::initLCD(LiquidCrystal *lcd,
 	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 23, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
 	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 11, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
 
-	rs->write(false);
-	en->write(false);
-	d4->write(false);
-	d5->write(false);
-  	d6->write(false);
-  	d7->write(false);
+	this->lcd1_rs->write(false);
+	this->lcd1_en->write(false);
+	this->lcd1_d4->write(false);
+	this->lcd1_d5->write(false);
+  	this->lcd1_d6->write(false);
+  	this->lcd1_d7->write(false);
 	// LCD init.
-	lcd = new LiquidCrystal(rs, en, d4, d5, d6, d7);
+	this->lcd1 = new LiquidCrystal(this->lcd1_rs, this->lcd1_en, this->lcd1_d4,
+								   this->lcd1_d5, this->lcd1_d6, this->lcd1_d7);
 	// LCD configure display geometry.
-	lcd->begin(16, 2);
-	lcd->setCursor (0, 0);
+	this->lcd1->begin(16, 2);
+	this->lcd1->setCursor (0, 0);
 }
 
 void thread_user_interface(void* pvParams)
diff --git a/source/shoh/src/threads/user_interface/UserInterface.h b/source/shoh/src/threads/user_interface/UserInterface.h
index 85befe5..5974c5b 100644
--- a/source/shoh/src/threads/user_interface/UserInterface.h
+++ b/source/shoh/src/threads/user_interface/UserInterface.h
@@ -23,7 +23,7 @@ public:
 
 	union InterfaceData
 	{
-		const char str[64];
+		const char* str;
 	};
 
 	struct InterfaceWithData
@@ -44,10 +44,7 @@ private:
 
 	//UIs
 	void handleLCD(LiquidCrystal *lcd, const char *str);
-	void initLCD(LiquidCrystal *lcd,
-				 DigitalIoPin *rs, DigitalIoPin *en,
-				 DigitalIoPin *d4, DigitalIoPin *d5,
-				 DigitalIoPin *d6, DigitalIoPin *d7);
+	void initLCD1();
 };
 
 void thread_user_interface(void* pvParams);

From 2b02a786fa3ff229c8db6317eec6eeeec00c493f Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Wed, 10 May 2023 13:11:41 +0300
Subject: [PATCH 15/18] Menu & UI: [#25, #35] Fixed UI.

*String in Menu are static. Temperature is limited by -99 and 99 bounds.
*UserInterface cleaned a bit.
---
 source/shoh/src/threads/manager/Menu.cpp      | 39 ++++++++++++-------
 source/shoh/src/threads/manager/Menu.h        |  2 +-
 .../threads/user_interface/UserInterface.cpp  |  4 --
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index ac002ae..b7765f1 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -10,11 +10,12 @@
 #include "UserInterface.h"
 
 Menu::Menu(ThreadCommon::QueueManager* qm): _qm(qm),
-current(&Menu::sInitView), set_point(0, 100, 1),
-main_text     ("CURRENT %2d      DESIRED %2d      "),
-set_point_text("CURRENT %2d      DESIRED[%2d]     ")
+current(&Menu::sInitView), ext_temp(-99, 99, 1), set_point(-99, 99, 1),
+main_text     ("CURRENT %3d     DESIRED %3d     "),
+set_point_text("CURRENT %3d     DESIRED[%3d]    ")
 {
 	this->SetState(&Menu::sInitView);
+    ext_temp.setCurrent(0);
     set_point.setCurrent(0);
 }
 
@@ -51,8 +52,8 @@ void Menu::HandleEventPair (Event::EventPair *ep)
             }
             break;
         case Event::ExternalTemp:
-            //Change ExternalTemp value.
-            this->ext_temp = ep->rd;
+            //Change ExternalTemp value. -99 <= ext_temp <= 99
+            this->ext_temp.setCurrent(ep->rd);
             //Refresh the menu screen.
             this->HandleObj(MenuObjEvent (MenuObjEvent::eRefresh));
             break;
@@ -73,6 +74,7 @@ void Menu::sInitView(const MenuObjEvent &e)
         this->NotifyAndRefreshUI("Loading...");
         break;
     case MenuObjEvent::eUnFocus:
+        printf("NOTE: leave sInitView\n");
         this->NotifyAndRefreshUI("");
         break;
     case MenuObjEvent::eRollClockWise:
@@ -80,6 +82,7 @@ void Menu::sInitView(const MenuObjEvent &e)
     case MenuObjEvent::eRollCClockWise:
         break;
     case MenuObjEvent::eClick:
+        this->SetState(&Menu::sMainView);
         break;
     case MenuObjEvent::eRefresh:
         printf("NOTE: sInitView handled eRefresh.\n");
@@ -92,11 +95,12 @@ void Menu::sInitView(const MenuObjEvent &e)
 
 void Menu::sMainView(const MenuObjEvent &e)
 {
-    char screen_text[64];
+    static char screen_text[64];
     switch (e.type)
     {
     case MenuObjEvent::eFocus: 
-        sprintf(screen_text, main_text, this->ext_temp, this->set_point.getCurrent());
+        sprintf(screen_text, main_text, this->ext_temp.getCurrent(),
+                                        this->set_point.getCurrent());
         this->NotifyAndRefreshUI(screen_text);
         break;
     case MenuObjEvent::eUnFocus:
@@ -110,7 +114,8 @@ void Menu::sMainView(const MenuObjEvent &e)
         this->SetState(&Menu::sSetPointMod);
         break;
     case MenuObjEvent::eRefresh:
-        sprintf(screen_text, main_text, this->ext_temp, this->set_point.getCurrent());
+        sprintf(screen_text, main_text, this->ext_temp.getCurrent(),
+                                        this->set_point.getCurrent());
         this->NotifyAndRefreshUI(screen_text);
         break;
     default:
@@ -120,11 +125,12 @@ void Menu::sMainView(const MenuObjEvent &e)
 
 void Menu::sSetPointMod(const MenuObjEvent &e)
 {
-    char screen_text[64];
+    static char screen_text[64];
     switch (e.type)
     {
     case MenuObjEvent::eFocus:
-        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        sprintf(screen_text, set_point_text, this->ext_temp.getCurrent(),
+                                             this->set_point.getCurrent());
         this->NotifyAndRefreshUI(screen_text);
         break;
     case MenuObjEvent::eUnFocus:
@@ -132,19 +138,22 @@ void Menu::sSetPointMod(const MenuObjEvent &e)
         break;
     case MenuObjEvent::eRollClockWise:
         set_point.inc();
-        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        sprintf(screen_text, set_point_text, this->ext_temp.getCurrent(),
+                                             this->set_point.getCurrent());
         this->NotifyAndRefreshUI(screen_text);
         break;
     case MenuObjEvent::eRollCClockWise:
         set_point.dec();
-        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        sprintf(screen_text, set_point_text, this->ext_temp.getCurrent(),
+                                             this->set_point.getCurrent());
         this->NotifyAndRefreshUI(screen_text);
         break;
     case MenuObjEvent::eClick:
         this->SetState(&Menu::sMainView);
         break;
     case MenuObjEvent::eRefresh:
-        sprintf(screen_text, set_point_text, this->ext_temp, this->set_point.getCurrent());
+        sprintf(screen_text, set_point_text, this->ext_temp.getCurrent(),
+                                             this->set_point.getCurrent());
         this->NotifyAndRefreshUI(screen_text);
         break;
     default:
@@ -168,6 +177,6 @@ void Menu::NotifyAndRefreshUI (const char *str)
 {
     //Send string on a queue to UI task.
     UserInterface::InterfaceWithData ud = {UserInterface::LCD1, str};
-    //Event * p_e = new Event(Event::EventType::NotifyUI, *(reinterpret_cast<EventRawData*>(&ud)));
-    this->_qm->send<UserInterface::InterfaceWithData>(ThreadCommon::QueueManager::ui_event_manager, &ud, portMAX_DELAY);
+    this->_qm->send<UserInterface::InterfaceWithData>(
+                    ThreadCommon::QueueManager::ui_event_manager, &ud, portMAX_DELAY);
 }
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
index c35a1fd..676ceb0 100644
--- a/source/shoh/src/threads/manager/Menu.h
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -27,7 +27,7 @@ private:
   /* Variables and objects */
   ThreadCommon::QueueManager* _qm;
   p_state current;
-  short ext_temp;
+  Counter<EventRawData> ext_temp;
   Counter<EventRawData> set_point;
   const char main_text[64];
   const char set_point_text[64];
diff --git a/source/shoh/src/threads/user_interface/UserInterface.cpp b/source/shoh/src/threads/user_interface/UserInterface.cpp
index f75634e..7a31991 100644
--- a/source/shoh/src/threads/user_interface/UserInterface.cpp
+++ b/source/shoh/src/threads/user_interface/UserInterface.cpp
@@ -26,15 +26,11 @@ UserInterface::~UserInterface()
 
 void UserInterface::taskFunction()
 {
-	Event data(Event::Null, 0);
 	InterfaceWithData ui_with_data;
 
 	for (;;)
 	{
 		this->_qm->receive<UserInterface::InterfaceWithData>(ThreadCommon::QueueManager::ui_event_manager, &ui_with_data, portMAX_DELAY);
-		//Don't mind the type, we care only about the raw_data.
-		//EventRawData ed = data.getDataOf(Event::NotifyUI);
-		//if(ed != ERROR_RETURN)
 		this->handleEvent(&ui_with_data);
 	}
 	

From 356b3ebbe95473b06ffa86e42ff01346c2b43718 Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Wed, 10 May 2023 13:12:13 +0300
Subject: [PATCH 16/18] LiquidCrystal.cpp: [#35] LCD now wraps text.

---
 source/shoh/src/peripherals/LiquidCrystal.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/shoh/src/peripherals/LiquidCrystal.cpp b/source/shoh/src/peripherals/LiquidCrystal.cpp
index 3a7988b..ac49f8d 100644
--- a/source/shoh/src/peripherals/LiquidCrystal.cpp
+++ b/source/shoh/src/peripherals/LiquidCrystal.cpp
@@ -195,15 +195,17 @@ void LiquidCrystal::home()
 
 void LiquidCrystal::print(std::string const &s)
 {
-	print(s.c_str());
+  print(s.c_str());
 }
 
 void LiquidCrystal::print(const char *s)
 {
-	while(*s) {
-		write(*s);
-		++s;
-	}
+  for (uint8_t i = 0; *s != '\0' && i <= 1; i++) {
+    for (size_t q = 0; *s != '\0' && q < 16; q++, s++) {
+      this->setCursor(q, i); 
+      this->write(*s);
+    }
+  }
 }
 
 void LiquidCrystal::setCursor(uint8_t col, uint8_t row)

From 0e64099a56fcb6d77d8be8d2902c38e4582264fa Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Wed, 10 May 2023 13:45:47 +0300
Subject: [PATCH 17/18] DigitalIoPin: Added LPC11U68 specific pin functions

*In order for pin to act as IO, it must be configured with
according function. Usually it is IOCON_FUNC0,
but some pins on port 0 are an exception (IOCON_FUNC1).
---
 source/shoh/src/peripherals/DigitalIoPin.cpp | 14 ++++++++++----
 source/shoh/src/peripherals/DigitalIoPin.h   |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/source/shoh/src/peripherals/DigitalIoPin.cpp b/source/shoh/src/peripherals/DigitalIoPin.cpp
index 51d4021..1028d3c 100644
--- a/source/shoh/src/peripherals/DigitalIoPin.cpp
+++ b/source/shoh/src/peripherals/DigitalIoPin.cpp
@@ -18,6 +18,12 @@ DigitalIoPin::DigitalIoPin (int port, int pin, bool input, bool pullup,
   _io._invert = invert;
   _io.IOCON_mode = IOCON_MODE_INACT;
   _io.IOCON_inv = IOCON_FUNC0;
+  //Table 83 from UM10732-11u68.pdf
+  if(port == 0 && ((pin >= 10 && pin <= 15) || pin == 0))
+    _io.IOFunction = IOCON_FUNC1;
+  else
+    _io.IOFunction = IOCON_FUNC0;
+
   if (isr){
     _io.isr_i = isr_index;
     setIsr();
@@ -48,7 +54,7 @@ DigitalIoPin::setIoPin ()
         }
     }
   Chip_IOCON_PinMuxSet (LPC_IOCON, _io._port, _io._pin,
-                        (_io.IOCON_mode | _io.DigitalEn | _io.IOCON_inv));
+                        (_io.IOFunction | _io.IOCON_mode | _io.DigitalEn | _io.IOCON_inv));
   /**	False direction equals input */
   Chip_GPIO_SetPinDIR (LPC_GPIO, _io._port, _io._pin, direction);
 }
@@ -75,9 +81,9 @@ DigitalIoPin::setIsr ()
 	Chip_Clock_SetIOCONFiltClockDiv(0, 64);
 
   Chip_IOCON_PinMuxSet (LPC_IOCON, _io._port, _io._pin,
-						(_io.IOCON_mode | _io.DigitalEn
-						| _io.IOCON_inv | IOCON_CLKDIV(0)
-						| IOCON_S_MODE(3)));
+						(_io.IOFunction | _io.IOCON_mode
+						| _io.DigitalEn | _io.IOCON_inv
+						| IOCON_CLKDIV(0) | IOCON_S_MODE(3)));
   /**	False direction equals input */
   Chip_GPIO_SetPinDIR (LPC_GPIO, _io._port, _io._pin, direction);
 
diff --git a/source/shoh/src/peripherals/DigitalIoPin.h b/source/shoh/src/peripherals/DigitalIoPin.h
index 19c6c7b..6241aa9 100644
--- a/source/shoh/src/peripherals/DigitalIoPin.h
+++ b/source/shoh/src/peripherals/DigitalIoPin.h
@@ -23,6 +23,7 @@ typedef struct DigitalIOConfigStruct
   uint32_t IOCON_mode;
   uint32_t IOCON_inv;
   uint32_t DigitalEn;
+  uint32_t IOFunction;
   IRQn_Type isr_i;
 } DigitalIOConfigStruct;
 

From 80a89806f74c15e8bc73ddc9191bcc2891dc3787 Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Wed, 10 May 2023 13:47:06 +0300
Subject: [PATCH 18/18] UI: [#35] Remove redundant fix.

*DigitalIoPin now handles pin muxing properly.
---
 source/shoh/src/threads/user_interface/UserInterface.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/source/shoh/src/threads/user_interface/UserInterface.cpp b/source/shoh/src/threads/user_interface/UserInterface.cpp
index 7a31991..bafd5d4 100644
--- a/source/shoh/src/threads/user_interface/UserInterface.cpp
+++ b/source/shoh/src/threads/user_interface/UserInterface.cpp
@@ -76,14 +76,6 @@ void UserInterface::initLCD1()
 	this->lcd1_d6 = new DigitalIoPin(0, 23, false);
 	this->lcd1_d7 = new DigitalIoPin(0, 11, false);
 
-	//Fix Pin Muxing.
-	Chip_IOCON_PinMuxSet (LPC_IOCON, 1, 9, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 14, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 13, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 12, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 23, (IOCON_FUNC0 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-	Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 11, (IOCON_FUNC1 | IOCON_MODE_INACT | IOCON_DIGMODE_EN));
-
 	this->lcd1_rs->write(false);
 	this->lcd1_en->write(false);
 	this->lcd1_d4->write(false);