From 03fe849fec0994b3e1fa2491dc3ae370084213ae206f2541efaaa1a0d281d60c Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Fri, 13 Dec 2024 23:17:45 +0100
Subject: [PATCH] cleanup main

---
 main/control.c |  3 +++
 main/main.c    | 64 +++-----------------------------------------------
 main/safety.c  |  2 ++
 3 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/main/control.c b/main/control.c
index 7e6b262..0b64e78 100644
--- a/main/control.c
+++ b/main/control.c
@@ -43,6 +43,9 @@ void taskControl(void *pvParameters)
         if (getSafetyState() == SAFETY_NO_ERROR)
         {
             // TODO: control the burner based on timetable
+
+            setCirculationPumpState(DISABLED);
+            setBurnerState(ENABLED);
         }
         else
         {
diff --git a/main/main.c b/main/main.c
index e136b16..1ee85ff 100644
--- a/main/main.c
+++ b/main/main.c
@@ -16,6 +16,7 @@
 #include "metrics.h"
 #include "outputs.h"
 #include "inputs.h"
+#include "control.h"
 
 #define I2C_MASTER_SCL 19
 #define I2C_MASTER_SDA 18
@@ -35,74 +36,15 @@ void app_main(void)
     }
     ESP_ERROR_CHECK(ret);
 
+    // TODO: Error handling!
     initOutputs();
     initInputs();
     initSafety();
+    initControl();
     initMetrics();
 
-    /*TODO: will be done by safety on the future*/
-    setCirculationPumpState(DISABLED);
-    setBurnerState(DISABLED);
-
-    ESP_LOGI(TAG, "running main loop now");
-
     while (1)
     {
         vTaskDelay(pdMS_TO_TICKS(2048));
-
-        /*
-
-        if (getBurnerError() == FAULT)
-        {
-            ESP_LOGI(TAG, "Burner FAULT");
-        }
-        else
-        {
-            ESP_LOGI(TAG, "Burner OK");
-        }
-                setCirculationPumpState(ENABLED);
-                setBurnerState(ENABLED);
-
-                if (getBurnerState() == ENABLED)
-                {
-                    ESP_LOGI(TAG, "Burner ENABLED");
-                }
-                else
-                {
-                    ESP_LOGI(TAG, "Burner DISABLED");
-                }
-
-                if (getCirculationPumpState() == ENABLED)
-                {
-                    ESP_LOGI(TAG, "CirculationPump ENABLED");
-                }
-                else
-                {
-                    ESP_LOGI(TAG, "CirculationPump DISABLED");
-                }
-
-                ESP_LOGI(TAG,"\n");
-                vTaskDelay(pdMS_TO_TICKS(2000));
-                setCirculationPumpState(DISABLED);
-                setBurnerState(DISABLED);
-
-                if (getBurnerState() == ENABLED)
-                {
-                    ESP_LOGI(TAG, "Burner ENABLED");
-                }
-                else
-                {
-                    ESP_LOGI(TAG, "Burner DISABLED");
-                }
-
-                if (getCirculationPumpState() == ENABLED)
-                {
-                    ESP_LOGI(TAG, "CirculationPump ENABLED");
-                }
-                else
-                {
-                    ESP_LOGI(TAG, "CirculationPump DISABLED");
-                }
-                */
     }
 }
\ No newline at end of file
diff --git a/main/safety.c b/main/safety.c
index d490821..f3205c7 100644
--- a/main/safety.c
+++ b/main/safety.c
@@ -46,6 +46,8 @@ void initSafety(void)
     {
         ESP_LOGE(TAG, "Failed to create task");
     }
+
+    setSafeState(); // Set inital state
 }
 
 void taskSafety(void *pvParameters)