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

pred10s

Browse Source
This commit is contained in:
Hendrik Schutter 2024-12-26 11:20:07 +01:00
parent 80e48f632f
commit 56f1831d8c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/inputs.c
View File

@ -91,7 +91,7 @@ void updateAverage(sMeasurement *pMeasurement)
pMeasurement->average10s.fValue = sum / pMeasurement->average10s.bufferCount; 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.samples[pMeasurement->average60s.bufferIndex] = pMeasurement->fCurrentValue;
pMeasurement->average60s.bufferIndex = (pMeasurement->average60s.bufferIndex + 1) % AVG60_SAMPLE_SIZE; pMeasurement->average60s.bufferIndex = (pMeasurement->average60s.bufferIndex + 1) % AVG60_SAMPLE_SIZE;
@ -106,17 +106,16 @@ void updateAverage(sMeasurement *pMeasurement)
} }
sum = 0.0; 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]; sum += pMeasurement->average60s.samples[i];
} }
pMeasurement->average60s.fValue = sum / pMeasurement->average60s.bufferCount; pMeasurement->average60s.fValue = sum / pMeasurement->average60s.bufferCount;
*/
} }
/*
void updatePrediction(sMeasurement *pMeasurement) 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.samples[pMeasurement->predict10s.bufferIndex] = pMeasurement->fCurrentValue;
pMeasurement->predict10s.bufferIndex = (pMeasurement->predict10s.bufferIndex + 1) % PRED10_SAMPLE_SIZE; pMeasurement->predict10s.bufferIndex = (pMeasurement->predict10s.bufferIndex + 1) % PRED10_SAMPLE_SIZE;
@ -138,7 +137,6 @@ void updatePrediction(sMeasurement *pMeasurement)
} }
} }
} }
*/
void taskInput(void *pvParameters) void taskInput(void *pvParameters)
{ {
@ -199,8 +197,8 @@ void taskInput(void *pvParameters)
case ((uint64_t)uChamperTempSensorAddr): case ((uint64_t)uChamperTempSensorAddr):
sChamperTemperature.fCurrentValue = temp_c; sChamperTemperature.fCurrentValue = temp_c;
sChamperTemperature.state = MEASUREMENT_NO_ERROR; sChamperTemperature.state = MEASUREMENT_NO_ERROR;
// updateAverage(&sChamperTemperature); updateAverage(&sChamperTemperature);
// updatePrediction(&sChamperTemperature); updatePrediction(&sChamperTemperature);
sOutdoorTemperature.fCurrentValue = temp_c; sOutdoorTemperature.fCurrentValue = temp_c;
sOutdoorTemperature.state = MEASUREMENT_NO_ERROR; sOutdoorTemperature.state = MEASUREMENT_NO_ERROR;

11
main/metrics.c
View File

@ -128,12 +128,19 @@ void taskMetrics(void *pvParameters)
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average60s.fValue; aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().average60s.fValue;
u16MetricCounter++; u16MetricCounter++;
/*Chamber Temperature Predict 10s // Chamber Temperature Predict 10s
strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred10"); strcpy(aMetrics[u16MetricCounter].caMetricName, "chamber_temperature_pred10");
aMetrics[u16MetricCounter].type = FLOAT; aMetrics[u16MetricCounter].type = FLOAT;
aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().predict10s.fValue; aMetrics[u16MetricCounter].fMetricValue = getChamberTemperature().predict10s.fValue;
u16MetricCounter++; 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*/ /*Inlet Flow Temperature*/
strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature"); strcpy(aMetrics[u16MetricCounter].caMetricName, "inlet_flow_temperature");