Merge pull request #204 from Scorgan01/PSRAM

Data History Buffer: Moved buffers to PSRAM; extended wind buffer sizes to 1920 values

lib/obp60task/OBPDataOperations.h

@@ -39,12 +39,13 @@ public:
     HstryBuf(){
         hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; // Generate history buffers of zero size
     };
+    
     HstryBuf(int size) {
         hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; 
-        hstryBufList.twdHstry->resize(960); // store 960 TWD values for 16 minutes history
-        hstryBufList.twsHstry->resize(960);
-        hstryBufList.awdHstry->resize(960);
-        hstryBufList.awsHstry->resize(960);
+        hstryBufList.twdHstry->resize(size); // store <size> xWD values for <size>/60 minutes history
+        hstryBufList.twsHstry->resize(size);
+        hstryBufList.awdHstry->resize(size);
+        hstryBufList.awsHstry->resize(size);
     };
     void init(BoatValueList* boatValues, GwLog *log);
     void handleHstryBuf(bool useSimuData);

lib/obp60task/OBPRingBuffer.h

@@ -1,15 +1,48 @@
 #pragma once
 #include "GwSynchronized.h"
+#include "WString.h"
+#include "esp_heap_caps.h"
 #include <algorithm>
 #include <limits>
 #include <stdexcept>
 #include <vector>
-#include "WString.h"
+
+template <typename T>
+struct PSRAMAllocator {
+    using value_type = T;
+
+    PSRAMAllocator() = default;
+
+    template <class U>
+    constexpr PSRAMAllocator(const PSRAMAllocator<U>&) noexcept { }
+
+    T* allocate(std::size_t n)
+    {
+        void* ptr = heap_caps_malloc(n * sizeof(T), MALLOC_CAP_SPIRAM);
+        if (!ptr) {
+            return nullptr;
+        } else {
+            return static_cast<T*>(ptr);
+        }
+    }
+
+    void deallocate(T* p, std::size_t) noexcept
+    {
+        heap_caps_free(p);
+    }
+};
+
+template <class T, class U>
+bool operator==(const PSRAMAllocator<T>&, const PSRAMAllocator<U>&) { return true; }
+
+template <class T, class U>
+bool operator!=(const PSRAMAllocator<T>&, const PSRAMAllocator<U>&) { return false; }
 
 template <typename T>
 class RingBuffer {
 private:
-    std::vector<T> buffer; // THE buffer vector
+    //    std::vector<T> buffer; // THE buffer vector
+    std::vector<T, PSRAMAllocator<T>> buffer; // THE buffer vector, allocated in PSRAM
     size_t capacity;
     size_t head; // Points to the next insertion position
     size_t first; // Points to the first (oldest) valid element

lib/obp60task/OBPRingBuffer.tpp

@@ -35,6 +35,8 @@ RingBuffer<T>::RingBuffer(size_t size)
     , is_Full(false)
 {
     initCommon();
+
+    buffer.reserve(size);
     buffer.resize(size, MAX_VAL); // MAX_VAL indicate invalid values
 }
 
@@ -405,6 +407,7 @@ void RingBuffer<T>::resize(size_t newSize)
     is_Full = false;
 
     buffer.clear();
+    buffer.reserve(newSize);
     buffer.resize(newSize, MAX_VAL);
 }
 

lib/obp60task/PageWindPlot.cpp

@@ -83,7 +83,7 @@ class PageWindPlot : public Page {
     bool oldShowTruW = false; // remember recent user selection of wind data type
 
     int dataIntv = 1; // Update interval for wind history chart:
-                      // (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart
+                      // (1)|(2)|(3)|(4)|(8) x 240 seconds for 4, 8, 12, 16, 32 min. history chart
     bool useSimuData;
     String flashLED;
     String backlightMode;
@@ -147,6 +147,8 @@ public:
                 dataIntv = 3;
             } else if (dataIntv == 3) {
                 dataIntv = 4;
+            } else if (dataIntv == 4) {
+                dataIntv = 8;
             } else {
                 dataIntv = 1;
             }
@@ -204,7 +206,7 @@ public:
         static int xCenter; // Center of screen in x direction
         static const int yOffset = 48; // Offset for y coordinates of chart area
         static int cHeight; // height of chart area
-        static int bufSize; // History buffer size: 960 values for appox. 16 min. history chart
+        static int bufSize; // History buffer size: 1.920 values for 32 min. history chart
         static int intvBufSize; // Buffer size used for currently selected time interval
         int count; // current size of buffer
         static int numWndVals; // number of wind values available for current interval selection
@@ -285,7 +287,7 @@ public:
         currIdx = wdHstry->getLastIdx();
         numAddedBufVals = (currIdx - lastAddedIdx + bufSize) % bufSize; // Number of values added to buffer since last display
         if (dataIntv != oldDataIntv || count == 1) {
-            // new data interval selected by user
+            // new data interval selected by user; this is only x * 230 values instead of 240 seconds (4 minutes) per interval step
             intvBufSize = cHeight * dataIntv;
             numWndVals = min(count, (cHeight - 60) * dataIntv);
             bufStart = max(0, count - numWndVals);
@@ -298,6 +300,7 @@ public:
                 bufStart = max(0, bufStart - numAddedBufVals);
             }
         }
+        // LOG_DEBUG(GwLog::DEBUG,"PSRAM Size: %d kByte; free: %d Byte", ESP.getPsramSize()/1024, ESP.getFreePsram());
         LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, xWD: %.1f, xWS: %.2f, xWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, wind source: %s",
             count, wdHstry->getLast() / 1000.0 * radToDeg, wsHstry->getLast() / 1000.0 * 1.94384, BDataValid[0], intvBufSize, numWndVals, bufStart, numAddedBufVals, wdHstry->getLastIdx(),
             showTruW ? "True" : "App");

lib/obp60task/obp60task.cpp

@@ -431,7 +431,7 @@ void OBP60Task(GwApi *api){
     int lastPage=pageNumber;
 
     BoatValueList boatValues; //all the boat values for the api query
-    HstryBuf hstryBufList(960);  // Create ring buffers for history storage of some boat data
+    HstryBuf hstryBufList(1920);  // Create ring buffers for history storage of some boat data (1920 seconds = 32 minutes)
     WindUtils trueWind(&boatValues);  // Create helper object for true wind calculation
     //commonData.distanceformat=config->getString(xxx);
     //add all necessary data to common data