From 56f1831d8c7c18abbc014b263f54803d560ff735d47ac580fb8b106ca3456de8 Mon Sep 17 00:00:00 2001 From: localhorst Date: Thu, 26 Dec 2024 11:20:07 +0100 Subject: [PATCH] pred10s --- main/inputs.c | 14 ++++++-------- main/metrics.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/main/inputs.c b/main/inputs.c index fdcee66..c678e53 100644 --- a/main/inputs.c +++ b/main/inputs.c @@ -91,7 +91,7 @@ void updateAverage(sMeasurement *pMeasurement) pMeasurement->average10s.fValue = sum / pMeasurement->average10s.bufferCount; - /* Average form the last 60sec + /* Average form the last 60sec */ pMeasurement->average60s.samples[pMeasurement->average60s.bufferIndex] = pMeasurement->fCurrentValue; pMeasurement->average60s.bufferIndex = (pMeasurement->average60s.bufferIndex + 1) % AVG60_SAMPLE_SIZE; @@ -106,17 +106,16 @@ void updateAverage(sMeasurement *pMeasurement) } sum = 0.0; - for (int i = 0; i < pMeasurement->average60s.bufferCount; i++) + for (int i = 0; i <= pMeasurement->average60s.bufferCount; i++) { sum += pMeasurement->average60s.samples[i]; } pMeasurement->average60s.fValue = sum / pMeasurement->average60s.bufferCount; - */ } -/* + void updatePrediction(sMeasurement *pMeasurement) -{ Prediction of the value in 10sec +{ /* Prediction of the value in 10sec */ pMeasurement->predict10s.samples[pMeasurement->predict10s.bufferIndex] = pMeasurement->fCurrentValue; pMeasurement->predict10s.bufferIndex = (pMeasurement->predict10s.bufferIndex + 1) % PRED10_SAMPLE_SIZE; @@ -138,7 +137,6 @@ void updatePrediction(sMeasurement *pMeasurement) } } } -*/ void taskInput(void *pvParameters) { @@ -199,8 +197,8 @@ void taskInput(void *pvParameters) case ((uint64_t)uChamperTempSensorAddr): sChamperTemperature.fCurrentValue = temp_c; sChamperTemperature.state = MEASUREMENT_NO_ERROR; - // updateAverage(&sChamperTemperature); - // updatePrediction(&sChamperTemperature); + updateAverage(&sChamperTemperature); + updatePrediction(&sChamperTemperature); sOutdoorTemperature.fCurrentValue = temp_c; sOutdoorTemperature.state = MEASUREMENT_NO_ERROR; diff --git a/main/metrics.c b/main/metrics.c index ef9b55e..3d00a7c 100644 --- a/main/metrics.c +++ b/main/metrics.c @@ -128,12 +128,19 @@ void taskMetrics(void *pvParameters) aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average60s.fValue; u16MetricCounter++; - /*Chamber Temperature Predict 10s + // Chamber Temperature Predict 10s strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred10"); aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().predict10s.fValue; u16MetricCounter++; - */ + /* + //Chamber Temperature Predict 60s + strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred90"); + aMetrics[u16MetricCounter].type = FLOAT; + aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().predict60s.fValue; + u16MetricCounter++; + + */ /*Inlet Flow Temperature*/ strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature");