Update to espressif32 5.1 // esp-idf 4.4.1 // Arduino 2.0.4 (#312)

* refresh use some new or before not known api

Author: amandel

platformio.ini

@@ -38,7 +38,7 @@ src_dir = src
 extra_configs = custom_config.ini
 
 [env:esp32dev]
-platform = espressif32 @ ^3
+platform = espressif32 @ ^5.1
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
@@ -47,7 +47,7 @@ monitor_speed = 115200
 upload_speed = 921600
 board_build.partitions = src/sd-partition-table.csv
 lib_deps =
-    adafruit/Adafruit BusIO @ ^1.12.0
+    adafruit/Adafruit BusIO @ ^1.13.1
     ; https://arduinojson.org/v6/api/
     bblanchon/ArduinoJson @ ^6.19.4
     rlogiacco/CircularBuffer @ ^1.3.3

src/Firmware.cpp

@@ -72,7 +72,7 @@ bool Firmware::downloadToFlash(String url,
     size_t size = http.getSize();
     log_i("http size: %d. ", size);
     log_i("Will access Stream:, free heap %dkb", ESP.getFreeHeap() / 1024);
-    if (status == 200) {
+    if (status == HTTP_CODE_OK) {
       Update.begin();
       Update.onProgress([progress, size](size_t pos, size_t all) {
         progress(pos, size);
@@ -87,6 +87,10 @@ bool Firmware::downloadToFlash(String url,
         written += read;
       }
       log_i("Got %d bytes", written);
+    } else {
+      log_e("Got http status: %d", status);
+      http.end();
+      return false;
     }
   }
   http.end();

src/OpenBikeSensorFirmware.cpp

@@ -23,6 +23,7 @@
 
 #include <utils/obsutils.h>
 #include <utils/button.h>
+#include <utils/timeutils.h>
 #include "OpenBikeSensorFirmware.h"
 
 #include "SPIFFS.h"

src/configServer.cpp

@@ -913,9 +913,7 @@ static void handleAbout(HTTPRequest *req, HTTPResponse * res) {
   res->print(page);
   page.clear();
 
-  esp_chip_info_t ci;
-  esp_chip_info(&ci);
-  page += keyValue("Cores", String(ci.cores));
+  page += keyValue("Cores", ESP.getChipCores());
   page += keyValue("CPU frequency", ESP.getCpuFreqMHz(), "MHz");
 
   page += keyValue("SPIFFS size", ObsUtils::toScaledByteString(SPIFFS.totalBytes()));
@@ -1601,7 +1599,7 @@ static void handleFlashFileUpdateAction(HTTPRequest *req, HTTPResponse *res) {
 static void handleDeleteFiles(HTTPRequest *req, HTTPResponse * res) {
   const auto params = extractParameters(req);
   String path = getParameter(params, "path");
-  if (path != "trash") {
+  if (path != "/trash") {
     SD.mkdir("/trash");
   }
   bool moveToRoot = !getParameter(params, "move").isEmpty();
@@ -1617,7 +1615,7 @@ static void handleDeleteFiles(HTTPRequest *req, HTTPResponse * res) {
     if (param.first == "delete") {
       String file = param.second;
 
-      String fullName = path + (path.length() > 1 ? "/" : "") + file;
+      String fullName = path + (path.endsWith("/") ? "" : "/") + file;
 
       html += ObsUtils::encodeForXmlText(file) + " ➜ ";
       if (moveToRoot) {
@@ -1679,6 +1677,10 @@ static void handleSd(HTTPRequest *req, HTTPResponse *res) {
     displayTest->showTextOnGrid(0, 3, "Path:");
     displayTest->showTextOnGrid(1, 3, path);
 
+    if (!path.endsWith("/")) {
+      path += "/";
+    }
+
 // Iterate over directories
     File child = file.openNextFile();
     uint16_t counter = 0;
@@ -1690,7 +1692,6 @@ static void handleSd(HTTPRequest *req, HTTPResponse *res) {
         TimeUtils::dateTimeToString(child.getLastWrite())
         + " - " + ObsUtils::toScaledByteString(child.size()));
 
-      fileName = fileName.substring(int(fileName.lastIndexOf("/") + 1));
       fileName = ObsUtils::encodeForXmlAttribute(fileName);
       bool isDirectory = child.isDirectory();
       html +=
@@ -1700,7 +1701,7 @@ static void handleSd(HTTPRequest *req, HTTPResponse *res) {
          + "<input class='small' type='checkbox' value='" + fileName + "' name='delete'"
          + String(isDirectory ? "disabled" : "")
          + "><a href=\"/sd?path="
-         + String(child.name())
+         + path + String(child.name())
          + "\">"
          + String(isDirectory ? "&#x1F4C1;" : "&#x1F4C4;")
          + fileName
@@ -1726,7 +1727,8 @@ static void handleSd(HTTPRequest *req, HTTPResponse *res) {
     html += "</ul>";
 
     if (path != "/") {
-      String back = path.substring(0, path.lastIndexOf('/'));
+      String back = path.substring(
+        0, path.lastIndexOf('/', path.length() - 2));
       if (back.isEmpty()) {
         back = "/";
       }
@@ -1738,12 +1740,12 @@ static void handleSd(HTTPRequest *req, HTTPResponse *res) {
     }
 
     if (counter > 0) {
-      if (path == "/uploaded") {
+      if (path == "/uploaded/") {
         html += "<hr /><p>Move for new upload will move selected files to the root directory, where "
                 "they will be considered as new tracks and uploaded to the portal with the next "
                 "Track upload.</p><input type='submit' class='btn' name='move' value='Move for new upload' />";
       }
-      if (path == "/trash") {
+      if (path == "/trash/") {
         html += "<hr /><input type='submit' class='btn' value='Delete Selected' />";
       } else {
         html += "<hr /><input type='submit' class='btn' value='Move to Trash' />";

src/utils/median.h

@@ -24,6 +24,8 @@
 #ifndef OPENBIKESENSORFIRMWARE_MEDIAN_H
 #define OPENBIKESENSORFIRMWARE_MEDIAN_H
 
+#include <algorithm>
+
 template<typename T> class Median {
 
   public: