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

damping instead of 24h average

Browse Source
This commit is contained in:
Hendrik Schutter
2025-10-18 20:39:36 +02:00
parent 9ff3b38f70
commit b3a571da3f
3 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
main/inputs.c
View File

@ -88,26 +88,20 @@ void initMeasurement(sMeasurement *pMeasurement)
return;
pMeasurement->state = MEASUREMENT_FAULT;
pMeasurement->fCurrentValue = 0.0f;
pMeasurement->fCurrentValue = INITIALISATION_VALUE;
pMeasurement->fDampedValue = INITIALISATION_VALUE;
pMeasurement->average10s.fValue = 0.0f;
pMeasurement->average10s.fValue = INITIALISATION_VALUE;
pMeasurement->average10s.bufferCount = 0U;
pMeasurement->average10s.bufferIndex = 0U;
memset(pMeasurement->average10s.samples, 0U, AVG10S_SAMPLE_SIZE);
pMeasurement->average60s.fValue = 0.0f;
pMeasurement->average60s.fValue = INITIALISATION_VALUE;
pMeasurement->average60s.bufferCount = 0U;
pMeasurement->average60s.bufferIndex = 0U;
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 = INITIALISATION_VALUE;
pMeasurement->predict60s.bufferCount = 0U;
pMeasurement->predict60s.bufferIndex = 0U;
memset(pMeasurement->predict60s.samples, 0U, PRED60S_SAMPLE_SIZE);
@ -152,24 +146,22 @@ void updateAverage(sMeasurement *pMeasurement)
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)
// Damped current value
if (pMeasurement->fDampedValue == INITIALISATION_VALUE)
{
pMeasurement->average24h.bufferCount++;
pMeasurement->fDampedValue = pMeasurement->fCurrentValue;
}
sum = 0.0;
for (int i = 0; i <= pMeasurement->average24h.bufferCount; i++)
else
{
sum += pMeasurement->average24h.samples[i];
if (pMeasurement->fCurrentValue > pMeasurement->fDampedValue)
{
pMeasurement->fDampedValue = pMeasurement->fDampedValue + (DAMPING_FACTOR * (pMeasurement->fCurrentValue - pMeasurement->fDampedValue));
}
else
{
pMeasurement->fDampedValue = pMeasurement->fDampedValue - (DAMPING_FACTOR * (pMeasurement->fDampedValue - pMeasurement->fCurrentValue));
}
}
pMeasurement->average24h.fValue = sum / pMeasurement->average24h.bufferCount;
*/
}
void updatePrediction(sMeasurement *pMeasurement)
@ -297,9 +289,9 @@ void taskInput(void *pvParameters)
float linearRegressionPredict(const float *samples, size_t count, size_t bufferIndex, float futureIndex)
{
if (count == 0)
return 0.0f; // No prediction possible with no data
return INITIALISATION_VALUE; // No prediction possible with no data
float sumX = 0.0f, sumY = 0.0f, sumXY = 0.0f, sumX2 = 0.0f;
float sumX = INITIALISATION_VALUE, sumY = INITIALISATION_VALUE, sumXY = INITIALISATION_VALUE, sumX2 = INITIALISATION_VALUE;
for (size_t i = 0; i < count; i++)
{