diff --git a/main/inputs.c b/main/inputs.c index c418164..6e7156b 100644 --- a/main/inputs.c +++ b/main/inputs.c @@ -14,10 +14,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]; @@ -163,14 +163,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]) { @@ -178,18 +178,15 @@ void taskInput(void *pvParameters) sChamperTemperature.fCurrentValue = temp_c; sChamperTemperature.state = MEASUREMENT_NO_ERROR; updateAverage(&sChamperTemperature); - break; - case ((uint64_t)uOutdoorTempSensorAddr): + sOutdoorTemperature.fCurrentValue = temp_c; sOutdoorTemperature.state = MEASUREMENT_NO_ERROR; updateAverage(&sOutdoorTemperature); - break; - case ((uint64_t)uInletFlowTempSensorAddr): + sInletFlowTemperature.fCurrentValue = temp_c; sInletFlowTemperature.state = MEASUREMENT_NO_ERROR; updateAverage(&sInletFlowTemperature); - break; - case ((uint64_t)uReturnFlowTempSensorAddr): + sReturnFlowTemperature.fCurrentValue = temp_c; sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR; updateAverage(&sReturnFlowTemperature);