From 6b38a73d77de81e2badfbcb083e684e695cf5e85919b0e2d21bc571db2cc1574 Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Thu, 26 Dec 2024 19:08:50 +0100
Subject: [PATCH] Revert "switch to single sensor config"

This reverts commit 307278e67998021e87d9acb10f14c757632de49b08a8d6c2ff8663d32952c0b0.
---
 main/inputs.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/main/inputs.c b/main/inputs.c
index ba62a9e..8c68eb3 100644
--- a/main/inputs.c
+++ b/main/inputs.c
@@ -16,10 +16,10 @@ static const char *TAG = "smart-oil-heater-control-system-inputs";
 const uint8_t uBurnerFaultPin = 19U;
 const uint8_t uDS18B20Pin = 4U;
 
-const onewire_addr_t uChamperTempSensorAddr = 0x78000000c6c2f728;
-const onewire_addr_t uOutdoorTempSensorAddr = 0x78000000c6c2f728;
-const onewire_addr_t uInletFlowTempSensorAddr = 0x78000000c6c2f728;
-const onewire_addr_t uReturnFlowTempSensorAddr = 0x78000000c6c2f728;
+const onewire_addr_t uChamperTempSensorAddr = 0x3e0000001754be28;
+const onewire_addr_t uOutdoorTempSensorAddr = 0x880000001648e328;
+const onewire_addr_t uInletFlowTempSensorAddr = 0xe59cdef51e64ff28;
+const onewire_addr_t uReturnFlowTempSensorAddr = 0xa7a8e1531f64ff28;
 
 onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS];
 float fDS18B20Temps[MAX_DN18B20_SENSORS];
@@ -210,14 +210,14 @@ void taskInput(void *pvParameters)
                     if (ds18x20_measure_and_read_multi(uDS18B20Pin, uOneWireAddresses, sSensorCount, fDS18B20Temps) != ESP_OK)
                     {
                         ESP_LOGE(TAG, "1-Wire devices read error");
-                        vTaskDelay(PERIODIC_INTERVAL * 100U / portTICK_PERIOD_MS); // Wait 100ms if bus error occurred
+                        vTaskDelay(PERIODIC_INTERVAL * 100U / portTICK_PERIOD_MS); //Wait 100ms if bus error occurred
                     }
                     else
                     {
                         for (int j = 0; j < sSensorCount; j++)
                         {
                             float temp_c = fDS18B20Temps[j];
-                            ESP_LOGI(TAG, "Sensor: %08" PRIx64 " reports %lf°C", (uint64_t)uOneWireAddresses[j], temp_c);
+                            // ESP_LOGI(TAG, "Sensor: %08" PRIx64 " reports %lf°C", (uint64_t)uOneWireAddresses[j], temp_c);
 
                             switch ((uint64_t)uOneWireAddresses[j])
                             {
@@ -226,17 +226,20 @@ void taskInput(void *pvParameters)
                                 sChamperTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sChamperTemperature);
                                 updatePrediction(&sChamperTemperature);
-
+                                break;
+                            case ((uint64_t)uOutdoorTempSensorAddr):
                                 sOutdoorTemperature.fCurrentValue = temp_c;
                                 sOutdoorTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sOutdoorTemperature);
                                 updatePrediction(&sOutdoorTemperature);
-
+                                break;
+                            case ((uint64_t)uInletFlowTempSensorAddr):
                                 sInletFlowTemperature.fCurrentValue = temp_c;
                                 sInletFlowTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sInletFlowTemperature);
                                 updatePrediction(&sInletFlowTemperature);
-
+                                break;
+                            case ((uint64_t)uReturnFlowTempSensorAddr):
                                 sReturnFlowTemperature.fCurrentValue = temp_c;
                                 sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sReturnFlowTemperature);