2 Commits

Author SHA256 Message Date
d14ae528c0 silence error due to missing hardware 2025-02-17 21:18:48 +01:00
a72c0673b1 Improve efficiency (#21)
- Change to new One Wire Sensors that are no fakes
- Increase chamber temperature

Reviewed-on: #21
Co-authored-by: localhorst <localhorst@mosad.xyz>
Co-committed-by: localhorst <localhorst@mosad.xyz>
2025-02-08 20:05:14 +01:00
3 changed files with 17 additions and 12 deletions

View File

@ -12,7 +12,7 @@
#define RETURN_FLOW_TEMPERATURE_LOWER_LIMIT_DAY 30.0 #define RETURN_FLOW_TEMPERATURE_LOWER_LIMIT_DAY 30.0
#define RETURN_FLOW_TEMPERATURE_LOWER_LIMIT_NIGHT 25.0 #define RETURN_FLOW_TEMPERATURE_LOWER_LIMIT_NIGHT 25.0
#define CHAMPER_TEMPERATURE_TARGET 70.0 #define CHAMPER_TEMPERATURE_TARGET 80.0
#define BURNER_FAULT_DETECTION_THRESHOLD (60U * 3U) // Detect burner fault if after 3 minutes no burner start detected #define BURNER_FAULT_DETECTION_THRESHOLD (60U * 3U) // Detect burner fault if after 3 minutes no burner start detected
static const char *TAG = "smart-oil-heater-control-system-control"; static const char *TAG = "smart-oil-heater-control-system-control";
@ -59,13 +59,18 @@ void taskControl(void *pvParameters)
bool bBurnerFaultDetected = false; bool bBurnerFaultDetected = false;
int64_t i64BurnerEnableTimestamp = esp_timer_get_time(); int64_t i64BurnerEnableTimestamp = esp_timer_get_time();
time_t now;
while (1) while (1)
{ {
// Get the current time
time(&now);
ESP_LOGW(TAG, "Control loop time: %lli", now);
vTaskDelay(PERIODIC_INTERVAL * 1000U / portTICK_PERIOD_MS); vTaskDelay(PERIODIC_INTERVAL * 1000U / portTICK_PERIOD_MS);
if (getSafetyState() != SAFETY_NO_ERROR) if (getSafetyState() != SAFETY_NO_ERROR)
{ {
ESP_LOGW(TAG, "Control not possible due to safety fault!"); //ESP_LOGW(TAG, "Control not possible due to safety fault!");
sControlState = CONTROL_FAULT_SAFETY; sControlState = CONTROL_FAULT_SAFETY;
if (bHeatingInAction == true) if (bHeatingInAction == true)
{ {
@ -98,7 +103,7 @@ void taskControl(void *pvParameters)
if (bHeatingInAction == true) if (bHeatingInAction == true)
{ {
if (getChamberTemperature().fCurrentValue >= currentControlEntry.fChamberTemperature) if ((getChamberTemperature().fCurrentValue >= currentControlEntry.fChamberTemperature) || (getChamberTemperature().predict60s.fValue >= currentControlEntry.fChamberTemperature))
{ {
ESP_LOGI(TAG, "Chamber Target Temperature reached: Disable burner"); ESP_LOGI(TAG, "Chamber Target Temperature reached: Disable burner");
bHeatingInAction = false; bHeatingInAction = false;

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 = 0x3e0000001754be28; const onewire_addr_t uChamperTempSensorAddr = 0xd00000108cd01d28;
const onewire_addr_t uOutdoorTempSensorAddr = 0x880000001648e328; const onewire_addr_t uOutdoorTempSensorAddr = 0x78000000c6c2f728;
const onewire_addr_t uInletFlowTempSensorAddr = 0xe59cdef51e64ff28; const onewire_addr_t uInletFlowTempSensorAddr = 0x410000108b8c0628;
const onewire_addr_t uReturnFlowTempSensorAddr = 0xa7a8e1531f64ff28; const onewire_addr_t uReturnFlowTempSensorAddr = 0x90000108cc77c28;
onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS]; onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS];
float fDS18B20Temps[MAX_DN18B20_SENSORS]; float fDS18B20Temps[MAX_DN18B20_SENSORS];
@ -189,12 +189,12 @@ void taskInput(void *pvParameters)
if (ds18x20_scan_devices(uDS18B20Pin, uOneWireAddresses, MAX_DN18B20_SENSORS, &sSensorCount) != ESP_OK) if (ds18x20_scan_devices(uDS18B20Pin, uOneWireAddresses, MAX_DN18B20_SENSORS, &sSensorCount) != ESP_OK)
{ {
ESP_LOGE(TAG, "1-Wire device scan error!"); // ESP_LOGE(TAG, "1-Wire device scan error!");
} }
if (!sSensorCount) if (!sSensorCount)
{ {
ESP_LOGW(TAG, "No 1-Wire devices detected!"); // ESP_LOGW(TAG, "No 1-Wire devices detected!");
} }
else else
{ {
@ -203,14 +203,14 @@ void taskInput(void *pvParameters)
if (sSensorCount > MAX_DN18B20_SENSORS) if (sSensorCount > MAX_DN18B20_SENSORS)
{ {
sSensorCount = MAX_DN18B20_SENSORS; sSensorCount = MAX_DN18B20_SENSORS;
ESP_LOGW(TAG, "More 1-Wire devices found than expected!"); // ESP_LOGW(TAG, "More 1-Wire devices found than expected!");
} }
for (size_t iReadLoop = 0; iReadLoop < ONE_WIRE_LOOPS; iReadLoop++) for (size_t iReadLoop = 0; iReadLoop < ONE_WIRE_LOOPS; iReadLoop++)
{ {
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

View File

@ -85,7 +85,7 @@ void checkSensorSanity(void)
if (sCurrentMeasurement.state == MEASUREMENT_FAULT) if (sCurrentMeasurement.state == MEASUREMENT_FAULT)
{ {
ESP_LOGE(TAG, "%s Sensor not found!", sanityChecks[i].name); //ESP_LOGE(TAG, "%s Sensor not found!", sanityChecks[i].name);
sanityChecks[i].state = SENSOR_NOT_FOUND; sanityChecks[i].state = SENSOR_NOT_FOUND;
sSafetyState = SAFETY_SENSOR_ERROR; sSafetyState = SAFETY_SENSOR_ERROR;
} }