remove remaining FPSTR macro's

vortigont · Sep 4, 2024 · 4e726c1 · 4e726c1
1 parent 78bf159
commit 4e726c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/espem/espem.cpp b/espem/espem.cpp
@@ -138,7 +138,7 @@ void Espem::wdatareply(AsyncWebServerRequest *request){
 
   const auto m = pz->getMetricsPZ004();
   char buffer[JSON_SMPL_LEN];
-  sprintf_P(buffer, PGdatajsontpl,
+  sprintf(buffer, PGdatajsontpl,
             pz->getState()->dataAge(),
             m->asFloat(meter_t::vol),
             m->asFloat(meter_t::cur),
@@ -147,7 +147,7 @@ void Espem::wdatareply(AsyncWebServerRequest *request){
             m->asFloat(meter_t::frq),
             m->asFloat(meter_t::pf)
   );
-  request->send(200, FPSTR(PGmimejson), buffer );
+  request->send(200, PGmimejson, buffer );
 }
 
 
@@ -190,7 +190,7 @@ void DataStorage::wsamples(AsyncWebServerRequest *request) {
 
   LOG(printf, "TimeSeries buffer has %d items, scntr: %d\n", ts->getSize(), cnt);
 
-  AsyncWebServerResponse* response = request->beginChunkedResponse(FPSTR(PGmimejson),
+  AsyncWebServerResponse* response = request->beginChunkedResponse(PGmimejson,
                                   [this, iter, ts](uint8_t* buffer, size_t buffsize, size_t index) mutable -> size_t {
 
       // If provided bufer is not large enough to fit 1 sample chunk, than I'm just sending

diff --git a/espem/interface.cpp b/espem/interface.cpp
@@ -293,15 +293,15 @@ void set_directctrls(Interface *interf, const JsonObject *data, const char* acti
     // ena/disable polling
     if (sv.compare(V_EPOLLENA) == 0){
         espem->set_uirate( (*data)[action] ? embui.paramVariant(V_UI_UPDRT) : 0);
-        LOG(printf_P, PSTR("ESPEM: UI refresh state: %d\n"), (*data)[A_EPOLLENA].as<int>() );
+        LOG(printf, "ESPEM: UI refresh state: %d\n", (*data)[A_EPOLLENA].as<int>() );
         return;
     }
 
     // UI update rate
     if (sv.compare(V_UI_UPDRT) == 0){
         espem->set_uirate((*data)[action]);
         embui.var(V_UI_UPDRT, espem->get_uirate());
-        LOG( printf_P, PSTR("ESPEM: Set UI update rate to: %d\n"), espem->get_uirate() );
+        LOG( printf, "ESPEM: Set UI update rate to: %d\n", espem->get_uirate() );
         return;
     }
 

diff --git a/platformio.ini b/platformio.ini
@@ -50,7 +50,7 @@ all_serial1 =
 
 [esp32_base]
 extends = common
-platform = espressif32
+platform = espressif32 @ 6.8.1
 board = wemos_d1_mini32
 ;upload_speed = 460800
 monitor_filters = esp32_exception_decoder