From 856f009e7f2d5070a48057f7f256c5a0dd99f32c8ed8b0ea30fd4f853f4706e0 Mon Sep 17 00:00:00 2001 From: localhorst Date: Thu, 26 Dec 2024 18:54:50 +0100 Subject: [PATCH] add prediction to all temps --- main/inputs.c | 9 ++++++--- main/metrics.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/main/inputs.c b/main/inputs.c index c41b9e4..fb1a68f 100644 --- a/main/inputs.c +++ b/main/inputs.c @@ -234,15 +234,18 @@ void taskInput(void *pvParameters) sOutdoorTemperature.fCurrentValue = temp_c; sOutdoorTemperature.state = MEASUREMENT_NO_ERROR; - // updateAverage(&sOutdoorTemperature); + updateAverage(&sOutdoorTemperature); + updatePrediction(&sOutdoorTemperature); sInletFlowTemperature.fCurrentValue = temp_c; sInletFlowTemperature.state = MEASUREMENT_NO_ERROR; - // updateAverage(&sInletFlowTemperature); + updateAverage(&sInletFlowTemperature); + updatePrediction(&sInletFlowTemperature); sReturnFlowTemperature.fCurrentValue = temp_c; sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR; - // updateAverage(&sReturnFlowTemperature); + updateAverage(&sReturnFlowTemperature); + updatePrediction(&sReturnFlowTemperature); break; default: break; diff --git a/main/metrics.c b/main/metrics.c index c288bea..c7aaf6f 100644 --- a/main/metrics.c +++ b/main/metrics.c @@ -152,6 +152,12 @@ void taskMetrics(void *pvParameters) aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average60s.fValue; 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 strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature"); aMetrics[u16MetricCounter].type = FLOAT; @@ -170,6 +176,12 @@ void taskMetrics(void *pvParameters) aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average60s.fValue; 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 strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature"); aMetrics[u16MetricCounter].type = FLOAT; @@ -188,6 +200,12 @@ void taskMetrics(void *pvParameters) aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average60s.fValue; 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 sSensorSanityCheck aChecks[NUMBER_OF_SENSOR_SANITY_CHECKS]; getSensorSanityStates(aChecks);