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

add prediction to all temps

Browse Source
This commit is contained in:
Hendrik Schutter 2024-12-26 18:54:50 +01:00
parent 1564860213
commit 856f009e7f
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/inputs.c
View File

@ -234,15 +234,18 @@ void taskInput(void *pvParameters)
sOutdoorTemperature.fCurrentValue = temp_c; sOutdoorTemperature.fCurrentValue = temp_c;
sOutdoorTemperature.state = MEASUREMENT_NO_ERROR; sOutdoorTemperature.state = MEASUREMENT_NO_ERROR;
// updateAverage(&sOutdoorTemperature); updateAverage(&sOutdoorTemperature);
updatePrediction(&sOutdoorTemperature);
sInletFlowTemperature.fCurrentValue = temp_c; sInletFlowTemperature.fCurrentValue = temp_c;
sInletFlowTemperature.state = MEASUREMENT_NO_ERROR; sInletFlowTemperature.state = MEASUREMENT_NO_ERROR;
// updateAverage(&sInletFlowTemperature); updateAverage(&sInletFlowTemperature);
updatePrediction(&sInletFlowTemperature);
sReturnFlowTemperature.fCurrentValue = temp_c; sReturnFlowTemperature.fCurrentValue = temp_c;
sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR; sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR;
// updateAverage(&sReturnFlowTemperature); updateAverage(&sReturnFlowTemperature);
updatePrediction(&sReturnFlowTemperature);
break; break;
default: default:
break; break;

18
main/metrics.c
View File

@ -152,6 +152,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Inlet Flow Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().predict60s.fValue;
u16MetricCounter++;
// Outdoor Temperature // Outdoor Temperature
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature"); strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;
@ -170,6 +176,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Outdoor Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().predict60s.fValue;
u16MetricCounter++;
// Return Flow Temperature // Return Flow Temperature
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature"); strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;
@ -188,6 +200,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Return Flow Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().predict60s.fValue;
u16MetricCounter++;
// Sensor State // Sensor State
sSensorSanityCheck aChecks[NUMBER_OF_SENSOR_SANITY_CHECKS]; sSensorSanityCheck aChecks[NUMBER_OF_SENSOR_SANITY_CHECKS];
getSensorSanityStates(aChecks); getSensorSanityStates(aChecks);