From b21dc720ed6de9dfb134cf73f95a4b999c4168ecb345b3f0d8590958e0887091 Mon Sep 17 00:00:00 2001 From: localhorst Date: Thu, 26 Dec 2024 20:00:37 +0100 Subject: [PATCH] use lab single sensor --- main/inputs.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/main/inputs.c b/main/inputs.c index cb90d2a..ba62a9e 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 = 0x3e0000001754be28; -const onewire_addr_t uOutdoorTempSensorAddr = 0x880000001648e328; -const onewire_addr_t uInletFlowTempSensorAddr = 0xe59cdef51e64ff28; -const onewire_addr_t uReturnFlowTempSensorAddr = 0xa7a8e1531f64ff28; +const onewire_addr_t uChamperTempSensorAddr = 0x78000000c6c2f728; +const onewire_addr_t uOutdoorTempSensorAddr = 0x78000000c6c2f728; +const onewire_addr_t uInletFlowTempSensorAddr = 0x78000000c6c2f728; +const onewire_addr_t uReturnFlowTempSensorAddr = 0x78000000c6c2f728; onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS]; float fDS18B20Temps[MAX_DN18B20_SENSORS]; @@ -217,7 +217,7 @@ void taskInput(void *pvParameters) 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,20 +226,17 @@ 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);