M5 Paper SDCard

Author: bmorcelli

boards/m5stack-paper-s3/interface.cpp

@@ -11,7 +11,9 @@
 ***************************************************************************************/
 void _setup_gpio() {
     M5.begin();
+#if defined(ARDUINO_M5STACK_PAPERS3)
     M5.Display.setEpdMode(epd_mode_t::epd_fastest);
+#endif
 }
 
 /***************************************************************************************

boards/m5stack-paper-s3/platformio.ini

@@ -83,10 +83,10 @@ build_flags =
 	-DTFT_WIDTH=540
 	-DTFT_HEIGHT=960
 
-	-DSDCARD_CS=47
-	-DSDCARD_SCK=39
-	-DSDCARD_MISO=40
-	-DSDCARD_MOSI=38
+	-DSDCARD_CS=4
+	-DSDCARD_SCK=14
+	-DSDCARD_MISO=13
+	-DSDCARD_MOSI=12
 
 
 lib_deps =

src/settings.cpp

@@ -164,7 +164,7 @@ void settings_menu() {
                            saveConfigs();
                        }});
 #endif
-#if !defined(CORE_4MB) && defined(M5STACK)
+#if defined(PART_08MB) && defined(M5STACK)
     options.push_back({"Partition Change", [=]() { partitioner(); }});
     options.push_back({"List of Partitions", [=]() { partList(); }});
 #endif
@@ -517,28 +517,28 @@ bool saveIntoNVS() {
         log_i("Settings stored in NVS successfully");
     }
 
-    nvsHandle->commit();
-    if (!saveWifiIntoNVS()) { log_i("saveIntoNVS: failed to store WiFi list"); }
-    return true;
-}
-
-bool saveSessionToken(const String &token) {
-    esp_err_t err = ESP_OK;
-    auto nvsHandle = openNamespace("launcher", NVS_READWRITE, err);
-    if (!nvsHandle) return false;
-
-    if (token.isEmpty()) {
-        err = nvsHandle->erase_item("token");
-        if (err == ESP_ERR_NVS_NOT_FOUND) err = ESP_OK;
-    } else {
-        err = nvsHandle->set_string("token", token.c_str());
-    }
-
-    if (err == ESP_OK) { err = nvsHandle->commit(); }
-    return err == ESP_OK;
-}
-
-bool saveWifiIntoNVS() {
+    nvsHandle->commit();
+    if (!saveWifiIntoNVS()) { log_i("saveIntoNVS: failed to store WiFi list"); }
+    return true;
+}
+
+bool saveSessionToken(const String &token) {
+    esp_err_t err = ESP_OK;
+    auto nvsHandle = openNamespace("launcher", NVS_READWRITE, err);
+    if (!nvsHandle) return false;
+
+    if (token.isEmpty()) {
+        err = nvsHandle->erase_item("token");
+        if (err == ESP_ERR_NVS_NOT_FOUND) err = ESP_OK;
+    } else {
+        err = nvsHandle->set_string("token", token.c_str());
+    }
+
+    if (err == ESP_OK) { err = nvsHandle->commit(); }
+    return err == ESP_OK;
+}
+
+bool saveWifiIntoNVS() {
     JsonArray wifiList = ensureWifiListInternal();
     if (wifiList.isNull()) return false;
 
@@ -566,23 +566,23 @@ bool saveWifiIntoNVS() {
         }
     }
 
-    nvsHandle->commit();
-    return true;
-}
-
-String loadSessionToken() {
-    esp_err_t err = ESP_OK;
-    auto nvsHandle = openNamespace("launcher", NVS_READONLY, err);
-    if (!nvsHandle) return "";
-
-    char buffer[65] = {0};
-    err = nvsHandle->get_string("token", buffer, sizeof(buffer));
-    if (err != ESP_OK) return "";
-
-    return String(buffer);
-}
-
-void defaultValues() {
+    nvsHandle->commit();
+    return true;
+}
+
+String loadSessionToken() {
+    esp_err_t err = ESP_OK;
+    auto nvsHandle = openNamespace("launcher", NVS_READONLY, err);
+    if (!nvsHandle) return "";
+
+    char buffer[65] = {0};
+    err = nvsHandle->get_string("token", buffer, sizeof(buffer));
+    if (err != ESP_OK) return "";
+
+    return String(buffer);
+}
+
+void defaultValues() {
     // rotation = ROTATION;
     dimmerSet = 20;
     bright = 100;
@@ -989,5 +989,3 @@ void saveConfigs() {
     saveIntoNVS();
     saveWifiIntoNVS();
 }
-
-