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

average value for last 24h

Browse Source
This commit is contained in:
Hendrik Schutter
2025-10-12 13:10:26 +02:00
parent 9974e2d738
commit 067dc84afa
4 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main/inputs.c
View File

@ -93,17 +93,22 @@ void initMeasurement(sMeasurement *pMeasurement)
pMeasurement->average10s.fValue = 0.0f; pMeasurement->average10s.fValue = 0.0f;
pMeasurement->average10s.bufferCount = 0U; pMeasurement->average10s.bufferCount = 0U;
pMeasurement->average10s.bufferIndex = 0U; pMeasurement->average10s.bufferIndex = 0U;
memset(pMeasurement->average10s.samples, 0U, AVG10_SAMPLE_SIZE); memset(pMeasurement->average10s.samples, 0U, AVG10S_SAMPLE_SIZE);
pMeasurement->average60s.fValue = 0.0f; pMeasurement->average60s.fValue = 0.0f;
pMeasurement->average60s.bufferCount = 0U; pMeasurement->average60s.bufferCount = 0U;
pMeasurement->average60s.bufferIndex = 0U; pMeasurement->average60s.bufferIndex = 0U;
memset(pMeasurement->average60s.samples, 0U, AVG60_SAMPLE_SIZE); memset(pMeasurement->average60s.samples, 0U, AVG60S_SAMPLE_SIZE);
pMeasurement->average24h.fValue = 0.0f;
pMeasurement->average24h.bufferCount = 0U;
pMeasurement->average24h.bufferIndex = 0U;
memset(pMeasurement->average24h.samples, 0U, AVG24H_SAMPLE_SIZE);
pMeasurement->predict60s.fValue = 0.0f; pMeasurement->predict60s.fValue = 0.0f;
pMeasurement->predict60s.bufferCount = 0U; pMeasurement->predict60s.bufferCount = 0U;
pMeasurement->predict60s.bufferIndex = 0U; pMeasurement->predict60s.bufferIndex = 0U;
memset(pMeasurement->predict60s.samples, 0U, PRED60_SAMPLE_SIZE); memset(pMeasurement->predict60s.samples, 0U, PRED60S_SAMPLE_SIZE);
} }
void updateAverage(sMeasurement *pMeasurement) void updateAverage(sMeasurement *pMeasurement)
@ -113,9 +118,9 @@ void updateAverage(sMeasurement *pMeasurement)
// Average form the last 10sec // Average form the last 10sec
pMeasurement->average10s.samples[pMeasurement->average10s.bufferIndex] = pMeasurement->fCurrentValue; pMeasurement->average10s.samples[pMeasurement->average10s.bufferIndex] = pMeasurement->fCurrentValue;
pMeasurement->average10s.bufferIndex = (pMeasurement->average10s.bufferIndex + 1) % AVG10_SAMPLE_SIZE; pMeasurement->average10s.bufferIndex = (pMeasurement->average10s.bufferIndex + 1) % AVG10S_SAMPLE_SIZE;
if (pMeasurement->average10s.bufferCount < AVG10_SAMPLE_SIZE) if (pMeasurement->average10s.bufferCount < AVG10S_SAMPLE_SIZE)
{ {
pMeasurement->average10s.bufferCount++; pMeasurement->average10s.bufferCount++;
} }
@ -130,9 +135,9 @@ void updateAverage(sMeasurement *pMeasurement)
// Average form the last 60sec // Average form the last 60sec
pMeasurement->average60s.samples[pMeasurement->average60s.bufferIndex] = pMeasurement->fCurrentValue; pMeasurement->average60s.samples[pMeasurement->average60s.bufferIndex] = pMeasurement->fCurrentValue;
pMeasurement->average60s.bufferIndex = (pMeasurement->average60s.bufferIndex + 1) % AVG60_SAMPLE_SIZE; pMeasurement->average60s.bufferIndex = (pMeasurement->average60s.bufferIndex + 1) % AVG60S_SAMPLE_SIZE;
if (pMeasurement->average60s.bufferCount < AVG60_SAMPLE_SIZE) if (pMeasurement->average60s.bufferCount < AVG60S_SAMPLE_SIZE)
{ {
pMeasurement->average60s.bufferCount++; pMeasurement->average60s.bufferCount++;
} }
@ -144,6 +149,23 @@ void updateAverage(sMeasurement *pMeasurement)
} }
pMeasurement->average60s.fValue = sum / pMeasurement->average60s.bufferCount; pMeasurement->average60s.fValue = sum / pMeasurement->average60s.bufferCount;
// Average form the last 24h
pMeasurement->average24h.samples[pMeasurement->average24h.bufferIndex] = pMeasurement->fCurrentValue;
pMeasurement->average24h.bufferIndex = (pMeasurement->average24h.bufferIndex + 1) % AVG24H_SAMPLE_SIZE;
if (pMeasurement->average24h.bufferCount < AVG24H_SAMPLE_SIZE)
{
pMeasurement->average24h.bufferCount++;
}
sum = 0.0;
for (int i = 0; i <= pMeasurement->average24h.bufferCount; i++)
{
sum += pMeasurement->average24h.samples[i];
}
pMeasurement->average24h.fValue = sum / pMeasurement->average24h.bufferCount;
} }
void updatePrediction(sMeasurement *pMeasurement) void updatePrediction(sMeasurement *pMeasurement)
@ -154,8 +176,8 @@ void updatePrediction(sMeasurement *pMeasurement)
// Update predict60s buffer // Update predict60s buffer
sPredict *predict60s = &pMeasurement->predict60s; sPredict *predict60s = &pMeasurement->predict60s;
predict60s->samples[predict60s->bufferIndex] = pMeasurement->fCurrentValue; predict60s->samples[predict60s->bufferIndex] = pMeasurement->fCurrentValue;
predict60s->bufferIndex = (predict60s->bufferIndex + 1) % PRED60_SAMPLE_SIZE; predict60s->bufferIndex = (predict60s->bufferIndex + 1) % PRED60S_SAMPLE_SIZE;
if (predict60s->bufferCount < PRED60_SAMPLE_SIZE) if (predict60s->bufferCount < PRED60S_SAMPLE_SIZE)
predict60s->bufferCount++; predict60s->bufferCount++;
// Predict 60s future value using linear regression // Predict 60s future value using linear regression

12
main/inputs.h
View File

@ -1,9 +1,10 @@
#pragma once #pragma once
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#define AVG10_SAMPLE_SIZE 10U #define AVG10S_SAMPLE_SIZE 10U
#define AVG60_SAMPLE_SIZE 60U #define AVG60S_SAMPLE_SIZE 60U
#define PRED60_SAMPLE_SIZE 60U #define AVG24H_SAMPLE_SIZE 60U * 60U * 24U
#define PRED60S_SAMPLE_SIZE 60U
typedef enum _BurnerErrorState typedef enum _BurnerErrorState
{ {
@ -20,7 +21,7 @@ typedef enum _MeasurementErrorState
typedef struct _Average typedef struct _Average
{ {
float fValue; float fValue;
float samples[MAX(AVG10_SAMPLE_SIZE, AVG60_SAMPLE_SIZE)]; float samples[MAX(AVG10S_SAMPLE_SIZE, AVG60S_SAMPLE_SIZE)];
size_t bufferIndex; size_t bufferIndex;
size_t bufferCount; size_t bufferCount;
} sAverage; } sAverage;
@ -28,7 +29,7 @@ typedef struct _Average
typedef struct _Predict typedef struct _Predict
{ {
float fValue; float fValue;
float samples[PRED60_SAMPLE_SIZE]; float samples[PRED60S_SAMPLE_SIZE];
size_t bufferIndex; size_t bufferIndex;
size_t bufferCount; size_t bufferCount;
} sPredict; } sPredict;
@ -38,6 +39,7 @@ typedef struct _Measurement
float fCurrentValue; float fCurrentValue;
sAverage average10s; sAverage average10s;
sAverage average60s; sAverage average60s;
sAverage average24h;
sPredict predict60s; sPredict predict60s;
eMeasurementErrorState state; eMeasurementErrorState state;
} sMeasurement; } sMeasurement;

24
main/metrics.c
View File

@ -128,6 +128,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Chamber Temperature Average 24h
strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_avg24h");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average24h.fValue;
u16MetricCounter++;
// Chamber Temperature Predict 60s // Chamber Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred60"); strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;
@ -152,6 +158,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Inlet Flow Temperature Average 24h
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_avg24h");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getInletFlowTemperature().average24h.fValue;
u16MetricCounter++;
// Inlet Flow Temperature Predict 60s // Inlet Flow Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_pred60"); strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;
@ -176,6 +188,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Outdoor Temperature Average 24h
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_avg24h");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getOutdoorTemperature().average24h.fValue;
u16MetricCounter++;
// Outdoor Temperature Predict 60s // Outdoor Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_pred60"); strcpy(aMetrics[u16MetricCounter].caMetricName, "outdoor_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;
@ -200,6 +218,12 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
// Return Flow Temperature Average 24h
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_avg24h");
aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getReturnFlowTemperature().average24h.fValue;
u16MetricCounter++;
// Return Flow Temperature Predict 60s // Return Flow Temperature Predict 60s
strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_pred60"); strcpy(aMetrics[u16MetricCounter].caMetricName, "return_flow_temperature_pred60");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;

2
main/metrics.h
View File

@ -4,7 +4,7 @@
#define HTML_RESPONSE_SIZE 4096U #define HTML_RESPONSE_SIZE 4096U
#define METRIC_NAME_MAX_SIZE 64U #define METRIC_NAME_MAX_SIZE 64U
#define METRIC_MAX_COUNT 32U #define METRIC_MAX_COUNT 34U
typedef enum _MetricValueType typedef enum _MetricValueType
{ {