From 2a423714587d56374f0912155b937c4f7934b448 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Fri, 12 May 2023 23:25:07 +0300
Subject: [PATCH 1/7] relay: [#9] init task

---
 source/shoh/.cproject                     |  1 +
 source/shoh/src/threads/master/Master.cpp |  7 +++++
 source/shoh/src/threads/relay/Relay.cpp   | 33 +++++++++++++++++++++++
 source/shoh/src/threads/relay/Relay.h     | 24 +++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 source/shoh/src/threads/relay/Relay.cpp
 create mode 100644 source/shoh/src/threads/relay/Relay.h

diff --git a/source/shoh/.cproject b/source/shoh/.cproject
index 9a99684..1f9b41f 100644
--- a/source/shoh/.cproject
+++ b/source/shoh/.cproject
@@ -43,6 +43,7 @@
 								<option id="com.crt.advproject.cpp.fpu.1211390952" name="Floating point" superClass="com.crt.advproject.cpp.fpu" useByScannerDiscovery="true"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.417443680" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_board_nxp_lpcxpresso_11u68/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/threads/relay}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lpc_chip_11u6x/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/shoh/freertos}&quot;"/>
diff --git a/source/shoh/src/threads/master/Master.cpp b/source/shoh/src/threads/master/Master.cpp
index dbc1774..23d6536 100644
--- a/source/shoh/src/threads/master/Master.cpp
+++ b/source/shoh/src/threads/master/Master.cpp
@@ -9,6 +9,7 @@
 #include "Log.h"
 #include "ThreadCommon.h"
 #include "Rotary.h"
+#include "Relay.h"
 #include "Manager.h"
 #include "Logging.h"
 #include "UserInterface.h"
@@ -108,6 +109,9 @@ void thread_master(void* pvParams) {
 	manager->qm->createQueue(20,
 							sizeof(UserInterface::InterfaceWithData),
 							ThreadCommon::QueueManager::ui_event_manager);
+	manager->qm->createQueue(10,
+							sizeof(Event),
+							ThreadCommon::QueueManager::relay_event_master);
 	LOG_INFO("Master created queues");
 
 
@@ -121,6 +125,9 @@ void thread_master(void* pvParams) {
 	manager->tm->createTask(thread_user_interface, "user_interface",
 							configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
 							static_cast<void*>(manager));
+	manager->tm->createTask(thread_relay, "relay",
+							configMINIMAL_STACK_SIZE * 10,tskIDLE_PRIORITY + 1UL,
+							static_cast<void*>(manager));
 	LOG_INFO("Master created tasks");
 	m.taskFunction();
 }
diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
new file mode 100644
index 0000000..78cc214
--- /dev/null
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -0,0 +1,33 @@
+/*
+ * Relay.cpp
+ *
+ *  Created on: 12 May 2023
+ *      Author: tylen
+ */
+
+#include "Relay.h"
+#include "Event.h"
+#include "Log.h"
+
+Relay::Relay(ThreadCommon::QueueManager* qm): _qm(qm) {
+	LOG_DEBUG("Creating Relay");
+}
+
+Relay::~Relay() {
+	LOG_ERROR("Deleting Relay");
+}
+
+void Relay::taskFunction()
+{
+	Event data(Event::Null, 0);
+	for(;;)
+	{
+		_qm->receive<Event>(ThreadCommon::QueueManager::relay_event_master, &data, portMAX_DELAY);
+	}
+}
+
+void thread_relay(void * pvParams)
+{
+	ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
+	Relay r(manager->qm);
+}
\ No newline at end of file
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
new file mode 100644
index 0000000..1678d06
--- /dev/null
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -0,0 +1,24 @@
+/*
+ * Relay.h
+ *
+ *  Created on: 12 May 2023
+ *      Author: tylen
+ */
+
+#ifndef THREADS_RELAY_RELAY_H_
+#define THREADS_RELAY_RELAY_H_
+
+#include "ThreadCommon.h"
+
+class Relay {
+public:
+	Relay(ThreadCommon::QueueManager* qm);
+	virtual ~Relay();
+	void taskFunction();
+private:
+	ThreadCommon::QueueManager* _qm;
+};
+
+void thread_relay(void * pvParams);
+
+#endif /* THREADS_RELAY_RELAY_H_ */

From 1d9e53dc20170095e2017dfbf98c44ce004f4755 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Fri, 12 May 2023 23:59:50 +0300
Subject: [PATCH 2/7] relay: [#9] create relaydevice

---
 source/shoh/src/threads/relay/Relay.cpp | 23 +++++++++++++++++++++--
 source/shoh/src/threads/relay/Relay.h   | 16 ++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index 78cc214..5022f79 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -9,11 +9,30 @@
 #include "Event.h"
 #include "Log.h"
 
-Relay::Relay(ThreadCommon::QueueManager* qm): _qm(qm) {
+RelayDevice::RelayDevice(uint8_t en_pin, 
+						 uint8_t en_port, 
+						 uint8_t pha_pin, 
+						 uint8_t pha_port, 
+						 uint8_t relay_device_index
+						 )
+{
+	en = new DigitalIoPin(en_pin, en_port, false);
+	pha = new DigitalIoPin(pha_pin, pha_port, false);
+	LOG_DEBUG("Creating RelayDevice");
+}
+
+RelayDevice::~RelayDevice() 
+{
+	LOG_ERROR("Deleting RelayDevice");
+}
+
+Relay::Relay(ThreadCommon::QueueManager* qm): _qm(qm) 
+{
 	LOG_DEBUG("Creating Relay");
 }
 
-Relay::~Relay() {
+Relay::~Relay() 
+{
 	LOG_ERROR("Deleting Relay");
 }
 
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
index 1678d06..7065174 100644
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -9,6 +9,20 @@
 #define THREADS_RELAY_RELAY_H_
 
 #include "ThreadCommon.h"
+#include "DigitalIoPin.h"
+
+class RelayDevice {
+	public:
+		RelayDevice(uint8_t en_pin, 
+					uint8_t en_port, 
+					uint8_t pha_pin, 
+					uint8_t pha_port, 
+					uint8_t relay_device_index);
+		virtual ~RelayDevice();
+	private:
+		DigitalIoPin * en;
+		DigitalIoPin * pha;
+};
 
 class Relay {
 public:
@@ -17,6 +31,8 @@ public:
 	void taskFunction();
 private:
 	ThreadCommon::QueueManager* _qm;
+	RelayDevice relays [2] = {{0, 23, 0, 24, 0},
+							  {0, 25, 0, 26, 1}};
 };
 
 void thread_relay(void * pvParams);

From 07a6937077c97b0fbce3f7d4ede7da0aada76267 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 13 May 2023 00:24:31 +0300
Subject: [PATCH 3/7] relay: [#9] create Event parser

---
 source/shoh/src/threads/relay/Relay.cpp | 25 +++++++++++++++++++++++++
 source/shoh/src/threads/relay/Relay.h   |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index 5022f79..9b4cbad 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -9,6 +9,7 @@
 #include "Event.h"
 #include "Log.h"
 
+// TODO Remove en pins
 RelayDevice::RelayDevice(uint8_t en_pin, 
 						 uint8_t en_port, 
 						 uint8_t pha_pin, 
@@ -42,9 +43,33 @@ void Relay::taskFunction()
 	for(;;)
 	{
 		_qm->receive<Event>(ThreadCommon::QueueManager::relay_event_master, &data, portMAX_DELAY);
+		parseEvent(&data);
 	}
 }
 
+void Relay::parseEvent(Event* d)
+{
+	for (uint8_t i = Event::ExternalTemp; i <= Event::SetPoint; i++)
+		{
+			EventRawData rd = data.getDataOf(i);
+			if(rd == ERROR_RETURN)
+			{
+				continue;
+			}
+			switch(i /* EventType */)
+			{
+				case Event::ExternalTemp:
+					ext_temp = rd;
+					break;
+				case Event::SetPoint:
+					setpoint = rd;
+				default:
+					assert(0);
+			}
+		
+		}
+}
+
 void thread_relay(void * pvParams)
 {
 	ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
index 7065174..0a7b8bc 100644
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -10,6 +10,7 @@
 
 #include "ThreadCommon.h"
 #include "DigitalIoPin.h"
+#include "Counter.h"
 
 class RelayDevice {
 	public:
@@ -33,6 +34,9 @@ private:
 	ThreadCommon::QueueManager* _qm;
 	RelayDevice relays [2] = {{0, 23, 0, 24, 0},
 							  {0, 25, 0, 26, 1}};
+
+	void parseEvent(Event * d);
+	int8_t setpoint, ext_temp;
 };
 
 void thread_relay(void * pvParams);

From c468a0d828bc76ec2ce81fbb1de137e10ff8df1a Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 13 May 2023 00:26:48 +0300
Subject: [PATCH 4/7] relay: [#9] remove en pins from relaydevice

---
 source/shoh/src/threads/relay/Relay.cpp | 5 +----
 source/shoh/src/threads/relay/Relay.h   | 9 +++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index 9b4cbad..9e3adb7 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -10,14 +10,11 @@
 #include "Log.h"
 
 // TODO Remove en pins
-RelayDevice::RelayDevice(uint8_t en_pin, 
-						 uint8_t en_port, 
-						 uint8_t pha_pin, 
+RelayDevice::RelayDevice(uint8_t pha_pin, 
 						 uint8_t pha_port, 
 						 uint8_t relay_device_index
 						 )
 {
-	en = new DigitalIoPin(en_pin, en_port, false);
 	pha = new DigitalIoPin(pha_pin, pha_port, false);
 	LOG_DEBUG("Creating RelayDevice");
 }
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
index 0a7b8bc..b46c2d2 100644
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -14,14 +14,11 @@
 
 class RelayDevice {
 	public:
-		RelayDevice(uint8_t en_pin, 
-					uint8_t en_port, 
-					uint8_t pha_pin, 
+		RelayDevice(uint8_t pha_pin, 
 					uint8_t pha_port, 
 					uint8_t relay_device_index);
 		virtual ~RelayDevice();
 	private:
-		DigitalIoPin * en;
 		DigitalIoPin * pha;
 };
 
@@ -32,8 +29,8 @@ public:
 	void taskFunction();
 private:
 	ThreadCommon::QueueManager* _qm;
-	RelayDevice relays [2] = {{0, 23, 0, 24, 0},
-							  {0, 25, 0, 26, 1}};
+	RelayDevice relays [2] = {{0, 24, 0},
+							  {0, 26, 1}};
 
 	void parseEvent(Event * d);
 	int8_t setpoint, ext_temp;

From b7196b769edbd2510ee34e2b13c49e1ed28c03f6 Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 13 May 2023 01:05:49 +0300
Subject: [PATCH 5/7] relay: [#9] control the power mode

---
 source/shoh/src/threads/relay/Relay.cpp | 56 ++++++++++++++++++++++---
 source/shoh/src/threads/relay/Relay.h   | 20 ++++++++-
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index 9e3adb7..d6013f8 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -9,14 +9,17 @@
 #include "Event.h"
 #include "Log.h"
 
-// TODO Remove en pins
 RelayDevice::RelayDevice(uint8_t pha_pin, 
 						 uint8_t pha_port, 
-						 uint8_t relay_device_index
-						 )
+						 uint8_t relay_device_index,
+						 bool heat_output_1
+						 ) :
+						 heat_output_one(heat_output_1)
 {
 	pha = new DigitalIoPin(pha_pin, pha_port, false);
-	LOG_DEBUG("Creating RelayDevice");
+	LOG_DEBUG("Creating RelayDevice with output %d", 
+			  heat_output_one ? 1 : 2);
+	pha->write(heat_output_one);
 }
 
 RelayDevice::~RelayDevice() 
@@ -24,6 +27,17 @@ RelayDevice::~RelayDevice()
 	LOG_ERROR("Deleting RelayDevice");
 }
 
+void inline RelayDevice::RelayOn()
+{	
+	pha->write(!heat_output_one);	
+}
+
+void inline RelayDevice::RelayOff()
+{
+	pha->write(heat_output_one);
+}
+
+
 Relay::Relay(ThreadCommon::QueueManager* qm): _qm(qm) 
 {
 	LOG_DEBUG("Creating Relay");
@@ -34,6 +48,34 @@ Relay::~Relay()
 	LOG_ERROR("Deleting Relay");
 }
 
+void Relay::setPowerMode(PowerMode pm)
+{
+	switch (pm)
+	{
+	case PowerMode::POWER_0:
+		relays[INF_RELAY].RelayOff();
+		relays[SUP_RELAY].RelayOff();
+		LOG_INFO("Heater is turned OFF");
+	case PowerMode::POWER_1:
+		relays[INF_RELAY].RelayOn();
+		relays[SUP_RELAY].RelayOff();
+		LOG_INFO("Heater using power mode 1");
+		break;
+	case PowerMode::POWER_2:
+		relays[INF_RELAY].RelayOff();
+		relays[SUP_RELAY].RelayOn();
+		LOG_INFO("Heater using power mode 2");
+		break;
+	case PowerMode::POWER_3:
+		relays[INF_RELAY].RelayOn();
+		relays[SUP_RELAY].RelayOn();
+		LOG_INFO("Heater using power mode 3");
+		break;
+	default:
+		break;
+	}
+}
+
 void Relay::taskFunction()
 {
 	Event data(Event::Null, 0);
@@ -48,7 +90,7 @@ void Relay::parseEvent(Event* d)
 {
 	for (uint8_t i = Event::ExternalTemp; i <= Event::SetPoint; i++)
 		{
-			EventRawData rd = data.getDataOf(i);
+			EventRawData rd = d->getDataOf(static_cast<Event::EventType>(i));
 			if(rd == ERROR_RETURN)
 			{
 				continue;
@@ -60,8 +102,10 @@ void Relay::parseEvent(Event* d)
 					break;
 				case Event::SetPoint:
 					setpoint = rd;
+					break;
 				default:
 					assert(0);
+					break;
 			}
 		
 		}
@@ -71,4 +115,4 @@ void thread_relay(void * pvParams)
 {
 	ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
 	Relay r(manager->qm);
-}
\ No newline at end of file
+}
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
index b46c2d2..7f92424 100644
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -11,22 +11,40 @@
 #include "ThreadCommon.h"
 #include "DigitalIoPin.h"
 #include "Counter.h"
+#include "Event.h"
 
 class RelayDevice {
 	public:
 		RelayDevice(uint8_t pha_pin, 
 					uint8_t pha_port, 
-					uint8_t relay_device_index);
+					uint8_t relay_device_index,
+					bool heat_output_1 = true);
 		virtual ~RelayDevice();
+		void RelayOn();
+		void RelayOff();
 	private:
 		DigitalIoPin * pha;
+		bool heat_output_one;
 };
 
 class Relay {
+	enum PowerMode 
+	{
+		POWER_0,
+		POWER_1,
+		POWER_2,
+		POWER_3
+	};
+	enum RelayType 
+	{
+		INF_RELAY,
+		SUP_RELAY
+	};
 public:
 	Relay(ThreadCommon::QueueManager* qm);
 	virtual ~Relay();
 	void taskFunction();
+	void setPowerMode(PowerMode pm);
 private:
 	ThreadCommon::QueueManager* _qm;
 	RelayDevice relays [2] = {{0, 24, 0},

From a0023e622e72b301a6f0707d42cb38df7fc1173d Mon Sep 17 00:00:00 2001
From: Vasily Davydov <vasilydavydovmail@yahoo.com>
Date: Sat, 13 May 2023 01:33:37 +0300
Subject: [PATCH 6/7] relay: [#9] utilize parsed event data

---
 source/shoh/src/threads/relay/Relay.cpp | 32 +++++++++++++++++++++++++
 source/shoh/src/threads/relay/Relay.h   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index d6013f8..0f90beb 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -83,6 +83,7 @@ void Relay::taskFunction()
 	{
 		_qm->receive<Event>(ThreadCommon::QueueManager::relay_event_master, &data, portMAX_DELAY);
 		parseEvent(&data);
+		utilizeEventData();
 	}
 }
 
@@ -111,6 +112,37 @@ void Relay::parseEvent(Event* d)
 		}
 }
 
+void Relay::utilizeEventData()
+{
+    PowerMode pm = POWER_0;
+    /* If setpoint is lower than ext_temp,
+	 * none of below checks will pass and function
+	 * shall turn OFF the heater.
+	 * When setpoint is always higher than ext_temp,
+     * we can use up to three stages determine how 
+	 * powerful the output of the signal should be.
+     */
+    int8_t diff = setpoint - ext_temp;
+
+    if (diff >= 10)
+    {
+        pm = POWER_3;
+    }
+
+    if (diff >= 5)
+    {
+        pm = POWER_2;
+    }
+
+    if (diff >= 1)
+    {
+        pm = POWER_1;
+    }
+
+    setPowerMode(pm);
+    return;
+}
+
 void thread_relay(void * pvParams)
 {
 	ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
index 7f92424..5ee61d4 100644
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -45,6 +45,7 @@ public:
 	virtual ~Relay();
 	void taskFunction();
 	void setPowerMode(PowerMode pm);
+	void utilizeEventData();
 private:
 	ThreadCommon::QueueManager* _qm;
 	RelayDevice relays [2] = {{0, 24, 0},

From b9f966dd89a3f955ccab1dc4c75260a75629af2a Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Sat, 13 May 2023 02:04:39 +0300
Subject: [PATCH 7/7] relay: [#9] Small fixes.

*Task function now actually gets executed.
*Power modes now work properly.
---
 source/shoh/src/threads/relay/Relay.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index 0f90beb..a8733b0 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -129,12 +129,12 @@ void Relay::utilizeEventData()
         pm = POWER_3;
     }
 
-    if (diff >= 5)
+    else if (diff >= 5)
     {
         pm = POWER_2;
     }
 
-    if (diff >= 1)
+    else if (diff >= 1)
     {
         pm = POWER_1;
     }
@@ -147,4 +147,5 @@ void thread_relay(void * pvParams)
 {
 	ThreadCommon::CommonManagers * manager = static_cast<ThreadCommon::CommonManagers*>(pvParams);
 	Relay r(manager->qm);
+	r.taskFunction();
 }