Merge pull request 'bugfix/linear-regression-prediction' (#19) from bugfix/linear-regression-prediction into main

Reviewed-on: #19

main/inputs.c

@@ -16,10 +16,10 @@ static const char *TAG = "smart-oil-heater-control-system-inputs";
 const uint8_t uBurnerFaultPin = 19U;
 const uint8_t uDS18B20Pin = 4U;
 
-const onewire_addr_t uChamperTempSensorAddr = 0x78000000c6c2f728;
-const onewire_addr_t uOutdoorTempSensorAddr = 0x78000000c6c2f728;
-const onewire_addr_t uInletFlowTempSensorAddr = 0x78000000c6c2f728;
-const onewire_addr_t uReturnFlowTempSensorAddr = 0x78000000c6c2f728;
+const onewire_addr_t uChamperTempSensorAddr = 0x3e0000001754be28;
+const onewire_addr_t uOutdoorTempSensorAddr = 0x880000001648e328;
+const onewire_addr_t uInletFlowTempSensorAddr = 0xe59cdef51e64ff28;
+const onewire_addr_t uReturnFlowTempSensorAddr = 0xa7a8e1531f64ff28;
 
 onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS];
 float fDS18B20Temps[MAX_DN18B20_SENSORS];
@@ -36,7 +36,7 @@ void taskInput(void *pvParameters);
 void initMeasurement(sMeasurement *pMeasurement);
 void updateAverage(sMeasurement *pMeasurement);
 void updatePrediction(sMeasurement *pMeasurement);
-float linearRegressionPredict(const float *samples, size_t count, float futureIndex);
+float linearRegressionPredict(const float *samples, size_t count, size_t bufferIndex, float futureIndex);
 
 void initInputs(void)
 {
@@ -162,6 +162,7 @@ void updatePrediction(sMeasurement *pMeasurement)
     predict60s->fValue = linearRegressionPredict(
         predict60s->samples,
         predict60s->bufferCount,
+        predict60s->bufferIndex,
         predict60s->bufferCount + 60.0f);
 }
 
@@ -217,7 +218,7 @@ void taskInput(void *pvParameters)
                         for (int j = 0; j < sSensorCount; j++)
                         {
                             float temp_c = fDS18B20Temps[j];
-                            ESP_LOGI(TAG, "Sensor: %08" PRIx64 " reports %lf°C", (uint64_t)uOneWireAddresses[j], temp_c);
+                            // ESP_LOGI(TAG, "Sensor: %08" PRIx64 " reports %lf°C", (uint64_t)uOneWireAddresses[j], temp_c);
 
                             switch ((uint64_t)uOneWireAddresses[j])
                             {
@@ -226,17 +227,20 @@ void taskInput(void *pvParameters)
                                 sChamperTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sChamperTemperature);
                                 updatePrediction(&sChamperTemperature);
-
+                                break;
+                            case ((uint64_t)uOutdoorTempSensorAddr):
                                 sOutdoorTemperature.fCurrentValue = temp_c;
                                 sOutdoorTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sOutdoorTemperature);
                                 updatePrediction(&sOutdoorTemperature);
-
+                                break;
+                            case ((uint64_t)uInletFlowTempSensorAddr):
                                 sInletFlowTemperature.fCurrentValue = temp_c;
                                 sInletFlowTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sInletFlowTemperature);
                                 updatePrediction(&sInletFlowTemperature);
-
+                                break;
+                            case ((uint64_t)uReturnFlowTempSensorAddr):
                                 sReturnFlowTemperature.fCurrentValue = temp_c;
                                 sReturnFlowTemperature.state = MEASUREMENT_NO_ERROR;
                                 updateAverage(&sReturnFlowTemperature);
@@ -264,7 +268,7 @@ void taskInput(void *pvParameters)
     }
 }
 
-float linearRegressionPredict(const float *samples, size_t count, float futureIndex)
+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
@@ -273,8 +277,11 @@ float linearRegressionPredict(const float *samples, size_t count, float futureIn
 
     for (size_t i = 0; i < count; i++)
     {
+        // Calculate the circular buffer index for the current sample
+        size_t circularIndex = (bufferIndex + i + 1) % count;
+
         float x = (float)i;               // Time index
-        float y = samples[i]; // Sample value
+        float y = samples[circularIndex]; // Sample value
 
         sumX += x;
         sumY += y;
@@ -285,7 +292,7 @@ float linearRegressionPredict(const float *samples, size_t count, float futureIn
     // Calculate slope (m) and intercept (b) of the line: y = mx + b
     float denominator = (count * sumX2 - sumX * sumX);
     if (fabs(denominator) < 1e-6)    // Avoid division by zero
-        return samples[count - 1]; // Return last value as prediction
+        return samples[bufferIndex]; // Return the latest value as prediction
 
     float m = (count * sumXY - sumX * sumY) / denominator;
     float b = (sumY - m * sumX) / count;