localhorst/smart-oil-heating-control-system
SHA256
1
0
Fork 0
Code Issues 6 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Revert "switch to single sensor config"

Browse Source 
This reverts commit 307278e679.
This commit is contained in:
Hendrik Schutter 2024-12-26 19:08:50 +01:00
parent b5229a4082
commit 6b38a73d77
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/inputs.c
View File

@ -16,10 +16,10 @@ static const char *TAG = "smart-oil-heater-control-system-inputs";
const uint8_t uBurnerFaultPin = 19U; const uint8_t uBurnerFaultPin = 19U;
const uint8_t uDS18B20Pin = 4U; const uint8_t uDS18B20Pin = 4U;
const onewire_addr_t uChamperTempSensorAddr = 0x78000000c6c2f728; const onewire_addr_t uChamperTempSensorAddr = 0x3e0000001754be28;
const onewire_addr_t uOutdoorTempSensorAddr = 0x78000000c6c2f728; const onewire_addr_t uOutdoorTempSensorAddr = 0x880000001648e328;
const onewire_addr_t uInletFlowTempSensorAddr = 0x78000000c6c2f728; const onewire_addr_t uInletFlowTempSensorAddr = 0xe59cdef51e64ff28;
const onewire_addr_t uReturnFlowTempSensorAddr = 0x78000000c6c2f728; const onewire_addr_t uReturnFlowTempSensorAddr = 0xa7a8e1531f64ff28;
onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS]; onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS];
float fDS18B20Temps[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) if (ds18x20_measure_and_read_multi(uDS18B20Pin, uOneWireAddresses, sSensorCount, fDS18B20Temps) != ESP_OK)
{ {
ESP_LOGE(TAG, "1-Wire devices read error"); 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 else
{ {
for (int j = 0; j < sSensorCount; j++) for (int j = 0; j < sSensorCount; j++)
{ {
float temp_c = fDS18B20Temps[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]) switch ((uint64_t)uOneWireAddresses[j])
{ {
@ -226,17 +226,20 @@ void taskInput(void *pvParameters)
sChamperTemperature.state = MEASUREMENT_NO_ERROR; sChamperTemperature.state = MEASUREMENT_NO_ERROR;
updateAverage(&sChamperTemperature); updateAverage(&sChamperTemperature);
updatePrediction(&sChamperTemperature); updatePrediction(&sChamperTemperature);
break;
case ((uint64_t)uOutdoorTempSensorAddr):
sOutdoorTemperature.fCurrentValue = temp_c; sOutdoorTemperature.fCurrentValue = temp_c;
sOutdoorTemperature.state = MEASUREMENT_NO_ERROR; sOutdoorTemperature.state = MEASUREMENT_NO_ERROR;
updateAverage(&sOutdoorTemperature); updateAverage(&sOutdoorTemperature);
updatePrediction(&sOutdoorTemperature); updatePrediction(&sOutdoorTemperature);
break;
case ((uint64_t)uInletFlowTempSensorAddr):
sInletFlowTemperature.fCurrentValue = temp_c; sInletFlowTemperature.fCurrentValue = temp_c;
sInletFlowTemperature.state = MEASUREMENT_NO_ERROR; sInletFlowTemperature.state = MEASUREMENT_NO_ERROR;
updateAverage(&sInletFlowTemperature); updateAverage(&sInletFlowTemperature);
updatePrediction(&sInletFlowTemperature); updatePrediction(&sInletFlowTemperature);
break;
case ((uint64_t)uReturnFlowTempSensorAddr):
sReturnFlowTemperature.fCurrentValue = temp_c; sReturnFlowTemperature.fCurrentValue = temp_c;
sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR; sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR;
updateAverage(&sReturnFlowTemperature); updateAverage(&sReturnFlowTemperature);