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

Compare commits

base: localhorst:da7a1be183e9ca87a2a0170815e7d688e2f6d94fa07d1d07ee0690c1c0cb01e9
Branches Tags
localhorst:main
localhorst:feature/summer-mode
localhorst:feature/wifi-stability
localhorst:testing/lab-temperature-sensor
localhorst:a0.0.1
..
compare: localhorst:66b7f8320ef075afeae2c93722735d796443b8ba0c3c913f26628d6e1c71b101
Branches Tags
localhorst:feature/summer-mode
localhorst:feature/wifi-stability
localhorst:main
localhorst:testing/lab-temperature-sensor
localhorst:a0.0.1

No commits in common. "da7a1be183e9ca87a2a0170815e7d688e2f6d94fa07d1d07ee0690c1c0cb01e9" and "66b7f8320ef075afeae2c93722735d796443b8ba0c3c913f26628d6e1c71b101" have entirely different histories.
da7a1be183 ... 66b7f8320e

1 changed files with 11 additions and 27 deletions
Show Stats Expand all files Collapse all files

38
main/control.c
View File

@ -16,7 +16,7 @@
#define CHAMBER_TEMPERATURE_TARGET 80.0f // Max cutoff temperature #define CHAMBER_TEMPERATURE_TARGET 80.0f // Max cutoff temperature
#define CHAMBER_TEMPERATURE_THRESHOLD 45.0f // Min threshold for burner enable #define CHAMBER_TEMPERATURE_THRESHOLD 45.0f // Min threshold for burner enable
#define OUTDOOR_TEMPERATURE_THRESHOLD 15.0f // Min threshold for burner enable #define OUTDOOR_TEMPERATURE_THRESHOLD 15.0f // Min threshold for burner enable
#define BURNER_FAULT_DETECTION_THRESHOLD (60U * 4U) // Burner fault detection after 4 minutes #define BURNER_FAULT_DETECTION_THRESHOLD (60U * 15U) // Burner fault detection after 15 minutes
static const char *TAG = "smart-oil-heater-control-system-control"; static const char *TAG = "smart-oil-heater-control-system-control";
static eControlState sControlState = CONTROL_STARTING; static eControlState sControlState = CONTROL_STARTING;
@ -58,17 +58,10 @@ void initControl(void)
} }
} }
typedef enum _BurnerState
{
BURNER_UNKNOWN,
BURNER_FIRED,
BURNER_FAULT
} eBurnerState;
void taskControl(void *pvParameters) void taskControl(void *pvParameters)
{ {
bool bHeatingInAction = false; bool bHeatingInAction = false;
eBurnerState eBurnerState = BURNER_UNKNOWN; bool bBurnerFaultDetected = false;
int64_t i64BurnerEnableTimestamp = esp_timer_get_time(); int64_t i64BurnerEnableTimestamp = esp_timer_get_time();
while (1) while (1)
@ -123,28 +116,20 @@ void taskControl(void *pvParameters)
} }
else if (esp_timer_get_time() - i64BurnerEnableTimestamp >= BURNER_FAULT_DETECTION_THRESHOLD * 1000000U) else if (esp_timer_get_time() - i64BurnerEnableTimestamp >= BURNER_FAULT_DETECTION_THRESHOLD * 1000000U)
{ {
if (eBurnerState == BURNER_UNKNOWN) if (getBurnerError() == FAULT)
{ {
if (getBurnerError() == FAULT) ESP_LOGW(TAG, "Burner fault detected after timeout!");
{ bHeatingInAction = false;
ESP_LOGW(TAG, "Burner fault detected after threshold!"); bBurnerFaultDetected = true;
bHeatingInAction = false; sControlState = CONTROL_FAULT_BURNER;
eBurnerState = BURNER_FAULT; setCirculationPumpState(ENABLED);
sControlState = CONTROL_FAULT_BURNER; setBurnerState(DISABLED);
setCirculationPumpState(ENABLED); setSafetyControlState(ENABLED);
setBurnerState(DISABLED);
setSafetyControlState(ENABLED);
}
else
{
ESP_LOGW(TAG, "No Burner fault detected after threshold!");
eBurnerState = BURNER_FIRED;
}
} }
} }
} }
if (!bHeatingInAction && (eBurnerState != BURNER_FAULT)) if (!bHeatingInAction && !bBurnerFaultDetected)
{ {
if (getOutdoorTemperature().average60s.fValue >= OUTDOOR_TEMPERATURE_THRESHOLD) if (getOutdoorTemperature().average60s.fValue >= OUTDOOR_TEMPERATURE_THRESHOLD)
{ {
@ -158,7 +143,6 @@ void taskControl(void *pvParameters)
(getChamberTemperature().fCurrentValue <= CHAMBER_TEMPERATURE_THRESHOLD)) (getChamberTemperature().fCurrentValue <= CHAMBER_TEMPERATURE_THRESHOLD))
{ {
ESP_LOGI(TAG, "Enabling burner: Return flow temperature target reached"); ESP_LOGI(TAG, "Enabling burner: Return flow temperature target reached");
eBurnerState = BURNER_UNKNOWN;
bHeatingInAction = true; bHeatingInAction = true;
setCirculationPumpState(ENABLED); setCirculationPumpState(ENABLED);
setBurnerState(ENABLED); setBurnerState(ENABLED);