From 4d78df09ccf4fb411bb8fe2e0e733f9141b16cf4 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Sat, 17 Jun 2023 16:56:30 +0200 Subject: [PATCH 1/8] Add M5stack (original core) config The M5stack board offers three interesting features for use with OpenEPaperLink: - LCD - SDCard slot - Modules including a batters Which means it can easily be used to walk around with an AP for testing purposes. The LCD is currely not used as the M5Stack library is so old that it collides with newer versions of eTFT which we are importing already. Signed-off-by: Mimoja --- ESP32_AP-Flasher/platformio.ini | 40 ++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 9cba1a2b..0f51e22a 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -280,4 +280,42 @@ build_flags = build_src_filter = +<*>-- - \ No newline at end of file + +[env:M5Stack_Core_ONE_AP] +platform = espressif32 +board = m5stack-core-esp32 +board_build.partitions = esp32_sdcard.csv + +build_flags = + -D BUILD_ENV_NAME=$PIOENV + -D BUILD_TIME=$UNIX_TIME + -D CORE_DEBUG_LEVEL=0 + + -D HAS_SDCARD + -D USE_SOFTSPI + -D SD_CARD_SS=4 + -D SD_CARD_CLK=18 + -D SD_CARD_MISO=19 + -D SD_CARD_MOSI=23 + + -D FLASHER_AP_SS=5 + -D FLASHER_AP_CLK=36 + -D FLASHER_AP_MOSI=26 + -D FLASHER_AP_MISO=35 + -D FLASHER_AP_RESET=2 + -D FLASHER_AP_POWER={-1} + -D FLASHER_AP_TEST=-1 + + -D FLASHER_AP_TXD=16 + -D FLASHER_AP_RXD=17 + + -D FLASHER_LED=-1 + -D FLASH_TIMEOUT=10 + + -D USER_SETUP_LOADED + -D DISABLE_ALL_LIBRARY_WARNINGS + -D ILI9341_DRIVER + -D SMOOTH_FONT + -D LOAD_FONT2 +build_src_filter = + +<*>-- From eae7c3a1594598ec161441db0defb1b6748575d2 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Sat, 17 Jun 2023 00:56:23 +0200 Subject: [PATCH 2/8] ESP: Delete files after transfer where requested Beyond around 20 APs the littleFs will no longer provide enough space to add .pending files. The original .raw files are premarily held to be able to send them to the web interface. In those rare cases where this is not strictly needed we can allow specific setups to auto-delete them. Signed-off-by: Mimoja --- ESP32_AP-Flasher/src/newproto.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp index 0a092c3c..09d9be7f 100644 --- a/ESP32_AP-Flasher/src/newproto.cpp +++ b/ESP32_AP-Flasher/src/newproto.cpp @@ -384,7 +384,11 @@ void processXferComplete(struct espXferComplete* xfc, bool local) { LittleFS.remove(dst_path); } if (LittleFS.exists(src_path)) { + #ifndef REMOVE_RAW LittleFS.rename(src_path, dst_path); + #else + LittleFS.remove(src_path); + #endif } time_t now; From f487092f7f4e819d7319395c878fc761f56fc359 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Sat, 17 Jun 2023 16:56:17 +0200 Subject: [PATCH 3/8] Add SDCard support To be able to store more images and never worry about running out of storage again we are adding support of SDCards. We are faced with two options: 1) Remove the LittleFS code 2) Allow for both FSs but increase the app partition as we run out of space. We have opted for 2 for two reasons: 1) Unformated SDCards can be initialized from the littleFS 2) If the SDCard and the flasher share the same SPI pins the SDCard needs to be completely disconnected so there needs to be a FS in that rare case. Performance wise the SDCard is not slowing the system down. Writing the AP db with 70 APs takes 2.5 seconds, on the SD only 800ms. This however is SD and setup depending. By default the SDCard is expected on pins 18,19,23 however this is configurable via preprocessor defines. Globally we replace LittleFS with a new pointer to the currently used FS allowing for hotswapping where the FS pointer is not saved. One case which is therefore not working is the SPIFSEditor which copies the FS interally. Signed-off-by: Mimoja --- ESP32_AP-Flasher/data/www/index.html | 2 +- ESP32_AP-Flasher/esp32_sdcard.csv | 7 + ESP32_AP-Flasher/include/storage.h | 37 +++++ ESP32_AP-Flasher/src/contentmanager.cpp | 24 +-- ESP32_AP-Flasher/src/flasher.cpp | 19 ++- ESP32_AP-Flasher/src/main.cpp | 4 + ESP32_AP-Flasher/src/makeimage.cpp | 12 +- ESP32_AP-Flasher/src/newproto.cpp | 42 +++--- ESP32_AP-Flasher/src/ota.cpp | 12 +- ESP32_AP-Flasher/src/serialap.cpp | 3 +- ESP32_AP-Flasher/src/storage.cpp | 189 ++++++++++++++++++++++++ ESP32_AP-Flasher/src/system.cpp | 4 +- ESP32_AP-Flasher/src/tag_db.cpp | 16 +- ESP32_AP-Flasher/src/web.cpp | 27 ++-- 14 files changed, 314 insertions(+), 84 deletions(-) create mode 100644 ESP32_AP-Flasher/esp32_sdcard.csv create mode 100644 ESP32_AP-Flasher/include/storage.h create mode 100644 ESP32_AP-Flasher/src/storage.cpp diff --git a/ESP32_AP-Flasher/data/www/index.html b/ESP32_AP-Flasher/data/www/index.html index e602545b..4837e20b 100644 --- a/ESP32_AP-Flasher/data/www/index.html +++ b/ESP32_AP-Flasher/data/www/index.html @@ -160,7 +160,7 @@ Latency will be around 40 seconds.">
⬤ loading
AP config
- + diff --git a/ESP32_AP-Flasher/esp32_sdcard.csv b/ESP32_AP-Flasher/esp32_sdcard.csv new file mode 100644 index 00000000..f3bcf0db --- /dev/null +++ b/ESP32_AP-Flasher/esp32_sdcard.csv @@ -0,0 +1,7 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x150000, +app1, app, ota_1, 0x160000,0x150000, +spiffs, data, spiffs, 0x2B0000,0x140000, +coredump, data, coredump,0x3F0000,0x10000, \ No newline at end of file diff --git a/ESP32_AP-Flasher/include/storage.h b/ESP32_AP-Flasher/include/storage.h new file mode 100644 index 00000000..a55dab09 --- /dev/null +++ b/ESP32_AP-Flasher/include/storage.h @@ -0,0 +1,37 @@ +#ifndef _DYN_STORAGE_H_ +#define _DYN_STORAGE_H_ + +#include "FS.h" + +#ifdef HAS_SDCARD +#ifndef SD_CARD_SS +#error SD_CARD_SS UNDEFINED +#endif + +#ifndef SD_CARD_CLK +#define SD_CARD_CLK 18 +#endif + +#ifndef SD_CARD_MISO +#define SD_CARD_MISO 19 +#endif + +#ifndef SD_CARD_MOSI +#define SD_CARD_MOSI 23 +#endif +#endif + +class DynStorage { + public: + DynStorage(); + void begin(); + void listFiles(); + + private: + bool isInited; +}; + +extern DynStorage Storage; +extern fs::FS *contentFS; + +#endif \ No newline at end of file diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index 6be2ae98..7d886afb 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -13,7 +13,7 @@ #ifdef CONTENT_RSS #include #endif -#include +#include "storage.h" #include #include @@ -143,7 +143,7 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) { if (imageParams.hasRed) imageParams.dataType = DATATYPE_IMG_RAW_2BPP; if (prepareDataAvail(&filename, imageParams.dataType, mac, cfgobj["timetolive"].as())) { cfgobj["#fetched"] = true; - if (cfgobj["delete"].as() == "1") LittleFS.remove("/" + cfgobj["filename"].as()); + if (cfgobj["delete"].as() == "1") contentFS->remove("/" + cfgobj["filename"].as()); } else { wsErr("Error accessing " + filename); } @@ -323,7 +323,7 @@ void drawString(TFT_eSprite &spr, String content, uint16_t posx, uint16_t posy, spr.setTextColor(PAL_BLACK, PAL_WHITE); spr.drawString(content, posx, posy); } else { - if (font != "") spr.loadFont(font, LittleFS); + if (font != "") spr.loadFont(font, *contentFS); spr.setTextColor(color, PAL_WHITE); spr.drawString(content, posx, posy); if (font != "") spr.unloadFont(); @@ -420,7 +420,7 @@ void drawNumber(String &filename, int32_t count, int32_t thresholdred, tagRecord if (count > 99) font = loc["fonts"][1].as(); if (count > 999) font = loc["fonts"][2].as(); if (count > 9999) font = loc["fonts"][3].as(); - spr.loadFont(font, LittleFS); + spr.loadFont(font, *contentFS); spr.drawString(String(count), loc["xy"][0].as(), loc["xy"][1].as()); spr.unloadFont(); @@ -505,7 +505,7 @@ void drawWeather(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgP dtostrf(temperature, 2, 1, tmpOutput); drawString(spr, String(tmpOutput), loc["temp"][0], loc["temp"][1], loc["temp"][2], TL_DATUM, (temperature < 0 ? PAL_RED : PAL_BLACK)); - spr.loadFont(loc["icon"][2], LittleFS); + spr.loadFont(loc["icon"][2], *contentFS); if (weathercode == 55 || weathercode == 65 || weathercode == 75 || weathercode == 82 || weathercode == 86 || weathercode == 95 || weathercode == 99) { spr.setTextColor(PAL_RED, PAL_WHITE); } else { @@ -515,7 +515,7 @@ void drawWeather(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgP spr.printToSprite(weatherIcons[weathercode]); spr.unloadFont(); - spr.loadFont(loc["dir"][2], LittleFS); + spr.loadFont(loc["dir"][2], *contentFS); spr.setTextColor(PAL_BLACK, PAL_WHITE); spr.setCursor(loc["dir"][0], loc["dir"][1]); spr.printToSprite(windDirectionIcon(winddirection)); @@ -578,7 +578,7 @@ void drawForecast(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, img uint8_t weathercode = doc["daily"]["weathercode"][dag].as(); if (weathercode > 40) weathercode -= 40; - spr.loadFont(loc["icon"][2], LittleFS); + spr.loadFont(loc["icon"][2], *contentFS); if (weathercode == 55 || weathercode == 65 || weathercode == 75 || weathercode == 82 || weathercode == 86 || weathercode == 95 || weathercode == 99) { spr.setTextColor(PAL_RED, PAL_WHITE); } else { @@ -597,7 +597,7 @@ void drawForecast(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, img int8_t tmax = round(doc["daily"]["temperature_2m_max"][dag].as()); uint8_t wind = windSpeedToBeaufort(doc["daily"]["windspeed_10m_max"][dag].as()); - spr.loadFont(loc["day"][2], LittleFS); + spr.loadFont(loc["day"][2], *contentFS); if (loc["rain"]) { int8_t rain = round(doc["daily"]["precipitation_sum"][dag].as()); @@ -624,7 +624,7 @@ void drawForecast(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, img int getImgURL(String &filename, String URL, time_t fetched, imgParam &imageParams, String MAC) { // https://images.klari.net/kat-bw29.jpg - LittleFS.begin(); + Storage.begin(); Serial.println("get external " + URL); HTTPClient http; @@ -634,7 +634,7 @@ int getImgURL(String &filename, String URL, time_t fetched, imgParam &imageParam http.setTimeout(5000); // timeout in ms int httpCode = http.GET(); if (httpCode == 200) { - File f = LittleFS.open("/temp/temp.jpg", "w"); + File f = contentFS->open("/temp/temp.jpg", "w"); if (f) { http.writeToStream(&f); f.close(); @@ -796,7 +796,7 @@ void drawQR(String &filename, String qrcontent, String title, tagRecord *&taginf #ifdef CONTENT_QR TFT_eSPI tft = TFT_eSPI(); TFT_eSprite spr = TFT_eSprite(&tft); - LittleFS.begin(); + Storage.begin(); const char *text = qrcontent.c_str(); QRCode qrcode; @@ -1031,7 +1031,7 @@ void prepareConfigFile(uint8_t *dst, JsonObject config) { } void getTemplate(JsonDocument &json, const char *filePath, uint8_t id, uint8_t hwtype) { - File jsonFile = LittleFS.open(filePath, "r"); + File jsonFile = contentFS->open(filePath, "r"); if (!jsonFile) { Serial.println("Failed to open content template file " + String(filePath)); return; diff --git a/ESP32_AP-Flasher/src/flasher.cpp b/ESP32_AP-Flasher/src/flasher.cpp index 4f9b3964..f1764caa 100644 --- a/ESP32_AP-Flasher/src/flasher.cpp +++ b/ESP32_AP-Flasher/src/flasher.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include "storage.h" #include // #include @@ -116,7 +116,6 @@ flasher::~flasher() { bool flasher::connectTag(uint8_t port) { bool result; - switch (port) { case 0: result = zbs->begin(FLASHER_AP_SS, FLASHER_AP_CLK, FLASHER_AP_MOSI, FLASHER_AP_MISO, FLASHER_AP_RESET, (uint8_t *)powerPinsAP, sizeof(powerPinsAP), 8000000); @@ -206,7 +205,7 @@ bool flasher::getInfoBlockType() { bool flasher::findTagByMD5() { StaticJsonDocument<3000> doc; DynamicJsonDocument APconfig(600); - fs::File readfile = LittleFS.open("/tag_md5_db.json", "r"); + fs::File readfile = contentFS->open("/tag_md5_db.json", "r"); DeserializationError err = deserializeJson(doc, readfile); if (!err) { for (JsonObject elem : doc.as()) { @@ -236,7 +235,7 @@ bool flasher::findTagByMD5() { bool flasher::findTagByType(uint8_t type) { StaticJsonDocument<3000> doc; DynamicJsonDocument APconfig(600); - fs::File readfile = LittleFS.open("/tag_md5_db.json", "r"); + fs::File readfile = contentFS->open("/tag_md5_db.json", "r"); DeserializationError err = deserializeJson(doc, readfile); if (!err) { for (JsonObject elem : doc.as()) { @@ -300,7 +299,7 @@ bool flasher::backupFlash() { getFirmwareMD5(); if (!zbs->select_flash(0)) return false; md5char[16] = 0x00; - fs::File backup = LittleFS.open("/" + (String)md5char + "_backup.bin", "w", true); + fs::File backup = contentFS->open("/" + (String)md5char + "_backup.bin", "w", true); for (uint32_t c = 0; c < 65535; c++) { backup.write(zbs->read_flash(c)); } @@ -474,7 +473,7 @@ bool flasher::writeFlashFromPackOffset(fs::File *file, uint16_t length) { bool flasher::writeFlashFromPack(String filename, uint8_t type) { StaticJsonDocument<512> doc; DynamicJsonDocument APconfig(512); - fs::File readfile = LittleFS.open(filename, "r"); + fs::File readfile = contentFS->open(filename, "r"); DeserializationError err = deserializeJson(doc, readfile); if (!err) { for (JsonObject elem : doc.as()) { @@ -505,7 +504,7 @@ bool flasher::writeFlashFromPack(String filename, uint8_t type) { uint16_t getAPUpdateVersion(uint8_t type) { StaticJsonDocument<512> doc; DynamicJsonDocument APconfig(512); - fs::File readfile = LittleFS.open("/AP_FW_Pack.bin", "r"); + fs::File readfile = contentFS->open("/AP_FW_Pack.bin", "r"); DeserializationError err = deserializeJson(doc, readfile); if (!err) { for (JsonObject elem : doc.as()) { @@ -529,7 +528,7 @@ uint16_t getAPUpdateVersion(uint8_t type) { } bool checkForcedAPFlash() { - return LittleFS.exists("/AP_force_flash.bin"); + return contentFS->exists("/AP_force_flash.bin"); } bool doForcedAPFlash() { @@ -547,14 +546,14 @@ bool doForcedAPFlash() { f->writeInfoBlock(); } - fs::File readfile = LittleFS.open("/AP_force_flash.bin", "r"); + fs::File readfile = contentFS->open("/AP_force_flash.bin", "r"); bool res = f->writeFlashFromPackOffset(&readfile, readfile.size()); #ifdef HAS_RGB_LED if (res) addFadeColor(CRGB::Green); if (!res) addFadeColor(CRGB::Red); #endif readfile.close(); - if (res) LittleFS.remove("/AP_force_flash.bin"); + if (res) contentFS->remove("/AP_force_flash.bin"); f->zbs->reset(); delete f; return res; diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp index 20c8cc26..9fcd7fe6 100644 --- a/ESP32_AP-Flasher/src/main.cpp +++ b/ESP32_AP-Flasher/src/main.cpp @@ -1,8 +1,10 @@ + #include #include #include #include +#include "storage.h" #include "contentmanager.h" #include "flasher.h" #include "makeimage.h" @@ -84,6 +86,8 @@ void setup() { heap_caps_malloc_extmem_enable(64); #endif + Storage.begin(); + /* Serial.println("\n\n##################################"); Serial.printf("Internal Total heap %d, internal Free Heap %d\n", ESP.getHeapSize(), ESP.getFreeHeap()); diff --git a/ESP32_AP-Flasher/src/makeimage.cpp b/ESP32_AP-Flasher/src/makeimage.cpp index 2cb090d0..1cc77192 100644 --- a/ESP32_AP-Flasher/src/makeimage.cpp +++ b/ESP32_AP-Flasher/src/makeimage.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include "storage.h" #include #include #include @@ -15,7 +15,7 @@ bool spr_output(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t *bitmap) } void jpg2buffer(String filein, String fileout, imgParam &imageParams) { - LittleFS.begin(); + Storage.begin(); TJpgDec.setSwapBytes(true); TJpgDec.setJpgScale(1); TJpgDec.setCallback(spr_output); @@ -23,7 +23,7 @@ void jpg2buffer(String filein, String fileout, imgParam &imageParams) { if (filein.c_str()[0] != '/') { filein = "/" + filein; } - TJpgDec.getFsJpgSize(&w, &h, filein, LittleFS); + TJpgDec.getFsJpgSize(&w, &h, filein, *contentFS); if (w==0 && h==0) { wsErr("invalid jpg"); return; @@ -47,7 +47,7 @@ void jpg2buffer(String filein, String fileout, imgParam &imageParams) { wsErr("Failed to create sprite in jpg2buffer"); } else { spr.fillSprite(TFT_WHITE); - TJpgDec.drawFsJpg(0, 0, filein, LittleFS); + TJpgDec.drawFsJpg(0, 0, filein, *contentFS); spr2buffer(spr, fileout, imageParams); spr.deleteSprite(); @@ -76,9 +76,9 @@ uint32_t colorDistance(const Color &c1, const Color &c2, const Error &e1) { void spr2buffer(TFT_eSprite &spr, String &fileout, imgParam &imageParams) { long t = millis(); - LittleFS.begin(); + Storage.begin(); - fs::File f_out = LittleFS.open(fileout, "w"); + fs::File f_out = contentFS->open(fileout, "w"); bool dither = true; uint8_t rotate = imageParams.rotate; diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp index 09d9be7f..ad2b130d 100644 --- a/ESP32_AP-Flasher/src/newproto.cpp +++ b/ESP32_AP-Flasher/src/newproto.cpp @@ -3,12 +3,12 @@ #include #include #include -#include +#include "storage.h" #include #include #include -#include "LittleFS.h" +#include "storage.h" #include "commstructs.h" #include "serialap.h" #include "settings.h" @@ -130,14 +130,14 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t } *filename = "/" + *filename; - LittleFS.begin(); + Storage.begin(); - if (!LittleFS.exists(*filename)) { + if (!contentFS->exists(*filename)) { wsErr("File not found. " + *filename); return false; } - fs::File file = LittleFS.open(*filename); + fs::File file = contentFS->open(*filename); uint32_t filesize = file.size(); if (filesize == 0) { file.close(); @@ -161,8 +161,8 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t if (memcmp(md5bytes, taginfo->md5pending, 16) == 0) { wsLog("new image is the same as current or already pending image. not updating tag."); wsSendTaginfo(dst, SYNC_TAGSTATUS); - if (LittleFS.exists(*filename)) { - LittleFS.remove(*filename); + if (contentFS->exists(*filename)) { + contentFS->remove(*filename); } return true; } @@ -182,10 +182,10 @@ bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t if (dataType != DATATYPE_FW_UPDATE) { char dst_path[64]; sprintf(dst_path, "/current/%02X%02X%02X%02X%02X%02X%02X%02X.pending\0", dst[7], dst[6], dst[5], dst[4], dst[3], dst[2], dst[1], dst[0]); - if (LittleFS.exists(dst_path)) { - LittleFS.remove(dst_path); + if (contentFS->exists(dst_path)) { + contentFS->remove(dst_path); } - LittleFS.rename(*filename, dst_path); + contentFS->rename(*filename, dst_path); *filename = String(dst_path); wsLog("new image: " + String(dst_path)); @@ -241,7 +241,7 @@ void prepareExternalDataAvail(struct pendingData* pending, IPAddress remoteIP) { case DATATYPE_IMG_RAW_1BPP: case DATATYPE_IMG_RAW_2BPP: case DATATYPE_IMG_RAW_1BPP_DIRECT: { - LittleFS.begin(); + Storage.begin(); char hexmac[17]; mac2hex(pending->targetMac, hexmac); @@ -252,13 +252,13 @@ void prepareExternalDataAvail(struct pendingData* pending, IPAddress remoteIP) { http.begin(imageUrl); int httpCode = http.GET(); if (httpCode == 200) { - File file = LittleFS.open(filename, "w"); + File file = contentFS->open(filename, "w"); http.writeToStream(&file); file.close(); } http.end(); - fs::File file = LittleFS.open(filename); + fs::File file = contentFS->open(filename); uint32_t filesize = file.size(); if (filesize == 0) { file.close(); @@ -338,7 +338,7 @@ void processBlockRequest(struct espBlockRequest* br) { if (taginfo->data == nullptr) { // not cached. open file, cache the data - fs::File file = LittleFS.open(taginfo->filename); + fs::File file = contentFS->open(taginfo->filename); if (!file) { Serial.print("No current file. Canceling request\n"); prepareCancelPending(br->src); @@ -380,14 +380,14 @@ void processXferComplete(struct espXferComplete* xfc, bool local) { char dst_path[64]; sprintf(src_path, "/current/%02X%02X%02X%02X%02X%02X%02X%02X.pending\0", xfc->src[7], xfc->src[6], xfc->src[5], xfc->src[4], xfc->src[3], xfc->src[2], xfc->src[1], xfc->src[0]); sprintf(dst_path, "/current/%02X%02X%02X%02X%02X%02X%02X%02X.raw\0", xfc->src[7], xfc->src[6], xfc->src[5], xfc->src[4], xfc->src[3], xfc->src[2], xfc->src[1], xfc->src[0]); - if (LittleFS.exists(dst_path) && LittleFS.exists(src_path)) { - LittleFS.remove(dst_path); + if (contentFS->exists(dst_path) && contentFS->exists(src_path)) { + contentFS->remove(dst_path); } - if (LittleFS.exists(src_path)) { + if (contentFS->exists(src_path)) { #ifndef REMOVE_RAW - LittleFS.rename(src_path, dst_path); + contentFS->rename(src_path, dst_path); #else - LittleFS.remove(src_path); + contentFS->remove(src_path); #endif } @@ -400,8 +400,8 @@ void processXferComplete(struct espXferComplete* xfc, bool local) { clearPending(taginfo); taginfo->wakeupReason = 0; if (taginfo->contentMode == 12 && local == false) { - if (LittleFS.exists(dst_path)) { - LittleFS.remove(dst_path); + if (contentFS->exists(dst_path)) { + contentFS->remove(dst_path); } } } diff --git a/ESP32_AP-Flasher/src/ota.cpp b/ESP32_AP-Flasher/src/ota.cpp index 9fa8cd0b..9815dd01 100644 --- a/ESP32_AP-Flasher/src/ota.cpp +++ b/ESP32_AP-Flasher/src/ota.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include "storage.h" #include #include @@ -51,7 +51,7 @@ void handleCheckFile(AsyncWebServerRequest* request) { } String filePath = request->getParam("path")->value(); - File file = LittleFS.open(filePath, "r"); + File file = contentFS->open(filePath, "r"); if (!file) { StaticJsonDocument<64> doc; doc["filesize"] = 0; @@ -121,7 +121,7 @@ void handleLittleFSUpload(AsyncWebServerRequest* request, String filename, size_ } else { path = request->getParam("path", true)->value(); Serial.println("update " + path); - request->_tempFile = LittleFS.open(path, "w", true); + request->_tempFile = contentFS->open(path, "w", true); } } if (len) { @@ -268,7 +268,7 @@ void handleRollback(AsyncWebServerRequest* request) { void handleUpdateActions(AsyncWebServerRequest* request) { wsSerial("Performing cleanup"); - File file = LittleFS.open("/update_actions.json", "r"); + File file = contentFS->open("/update_actions.json", "r"); if (!file) { wsSerial("No update_actions.json present"); request->send(200, "No update actions needed"); @@ -278,12 +278,12 @@ void handleUpdateActions(AsyncWebServerRequest* request) { DeserializationError error = deserializeJson(doc, file); JsonArray deleteFiles = doc["deletefile"].as(); for (const auto& filePath : deleteFiles) { - if (LittleFS.remove(filePath.as())) { + if (contentFS->remove(filePath.as())) { wsSerial("deleted file: " + filePath.as()); } } file.close(); wsSerial("Cleanup finished"); request->send(200, "Clean up finished"); - LittleFS.remove("/update_actions.json"); + contentFS->remove("/update_actions.json"); } \ No newline at end of file diff --git a/ESP32_AP-Flasher/src/serialap.cpp b/ESP32_AP-Flasher/src/serialap.cpp index 3cec6467..db249e6a 100644 --- a/ESP32_AP-Flasher/src/serialap.cpp +++ b/ESP32_AP-Flasher/src/serialap.cpp @@ -2,7 +2,6 @@ #include #include -#include #include "commstructs.h" #include "flasher.h" @@ -10,6 +9,7 @@ #include "newproto.h" #include "powermgt.h" #include "settings.h" +#include "storage.h" #include "web.h" #include "zbs_interface.h" @@ -205,6 +205,7 @@ bool sendDataAvail(struct pendingData* pending) { } if (waitCmdReply()) goto sdasend; Serial.printf("SDA send failed in try %d\n", attempt); + delay(200); } Serial.print("SDA failed to send...\n"); txEnd(); diff --git a/ESP32_AP-Flasher/src/storage.cpp b/ESP32_AP-Flasher/src/storage.cpp new file mode 100644 index 00000000..f923ac0e --- /dev/null +++ b/ESP32_AP-Flasher/src/storage.cpp @@ -0,0 +1,189 @@ +#include "storage.h" + +#ifdef HAS_SDCARD +#include "FS.h" +#include "SD.h" +#include "SPI.h" +#endif + +#include "LittleFS.h" + +DynStorage::DynStorage() : isInited(0) {} + +static void initLittleFS() { + LittleFS.begin(); + contentFS = &LittleFS; +} + +#ifdef HAS_SDCARD +static SPIClass* spi; + +static void initSDCard() { + uint8_t spi_bus = VSPI; + + // SD.begin and spi.begin are allocating memory so we dont want to do that + if(!spi) { + spi = new SPIClass(spi_bus); + spi->begin(SD_CARD_CLK, SD_CARD_MISO, SD_CARD_MOSI, SD_CARD_SS); + + bool res = SD.begin(SD_CARD_SS, *spi, 40000000); + if (!res) { + Serial.println("Card Mount Failed"); + return; + } + } + + uint8_t cardType = SD.cardType(); + + if (cardType == CARD_NONE) { + Serial.println("No SD card attached"); + return; + } + + contentFS = &SD; +} +#endif + +void copyToSD(FS &sourceFS, const char* source_path){ + File root = sourceFS.open(source_path); + +void copyFile(File in, File out) { + Serial.print("Copying "); + Serial.print(in.path()); + Serial.print(" to "); + Serial.println(out.path()); + + size_t n; + uint8_t buf[64]; + while ((n = in.read(buf, sizeof(buf))) > 0) { + out.write(buf, n); + } +} + +void copyBetweenFS(FS& sourceFS, const char* source_path, FS& targetFS) { + File root = sourceFS.open(source_path); + char next_path[128]; + + if (root.isDirectory()) { + if (!contentFS->exists(root.path())) { + if (!contentFS->mkdir(root.path())) { + Serial.print("Failed to create directory "); + Serial.println(root.path()); + return; + } + } + File file = root.openNextFile(); + while (file) { + if (file.isDirectory()) { + sprintf(next_path, "%s/%s\0", root.path(), file.path()); + + copyBetweenFS(sourceFS, file.path(), targetFS); + } else { + File target = contentFS->open(file.path(), "w"); + if (target) { + copyFile(file, target); + target.close(); + file.close(); + } else { + Serial.print("Couldn't create high target file"); + Serial.println(file.path()); + return; + } + } + file = root.openNextFile(); + } + } else { + File target = contentFS->open(root.path(), "w"); + if (target) { + copyFile(root, target); + } else { + Serial.print("Couldn't create target file "); + Serial.println(root.path()); + return; + } + } +} + +#ifdef HAS_SDCARD +void copyIfNeeded(const char* path) { + if (!contentFS->exists(path) && LittleFS.exists(path)) { + Serial.printf("SDCard does not contain %s, littleFS does, copying\n", path); + copyBetweenFS(LittleFS, path, *contentFS); + } +} +#endif + +void DynStorage::begin() { + initLittleFS(); + +#ifdef HAS_SDCARD + initSDCard(); + + copyIfNeeded("/index.html"); + copyIfNeeded("/fonts"); + copyIfNeeded("/www"); + copyIfNeeded("/AP_FW_Pack.bin"); + copyIfNeeded("/tag_md5_db.json"); + copyIfNeeded("/update_actions.json"); + copyIfNeeded("/content_template.json"); +#endif + + if (!contentFS->exists("/current")) { + contentFS->mkdir("/current"); + } + if (!contentFS->exists("/temp")) { + contentFS->mkdir("/temp"); + } +} + + +void listDir(fs::FS& fs, const char* dirname, uint8_t levels) { + Storage.begin(); + // Print blank line on screen + Serial.printf(" \n "); + + Serial.printf("Listing directory: %s\n", dirname); + + File root = fs.open(dirname); + if (!root) { + Serial.println("Failed to open directory"); + return; + } + if (!root.isDirectory()) { + Serial.println("Not a directory"); + return; + } + + File file = root.openNextFile(); + while (file) { + if (!strcmp("System Volume Information", file.name())) { + file = root.openNextFile(); + continue; + } + + if (file.isDirectory()) { + Serial.print(" DIR : "); + Serial.println(file.name()); + if (levels) { + listDir(fs, file.path(), levels - 1); + } + Serial.println(); + } else { + Serial.print(" FILE: "); + Serial.print(file.name()); + Serial.print(" SIZE: "); + Serial.println(file.size()); + } + file = root.openNextFile(); + } +} + +void DynStorage::listFiles() { + listDir(LittleFS, "/", 1); +#ifdef HAS_SDCARD + listDir(*contentFS, "/", 1); +#endif +} + +fs::FS* contentFS; +DynStorage Storage; diff --git a/ESP32_AP-Flasher/src/system.cpp b/ESP32_AP-Flasher/src/system.cpp index 07d2bc65..83879d08 100644 --- a/ESP32_AP-Flasher/src/system.cpp +++ b/ESP32_AP-Flasher/src/system.cpp @@ -3,7 +3,7 @@ #include #include -#include "LittleFS.h" +#include "storage.h" void init_time() { struct tm timeinfo; @@ -28,7 +28,7 @@ void logLine(String text) { char timeStr[24]; strftime(timeStr, sizeof(timeStr), "%Y-%m-%d %H:%M:%S ", localtime(&now)); - File logFile = LittleFS.open("/log.txt", "a"); + File logFile = contentFS->open("/log.txt", "a"); if (logFile) { logFile.print(timeStr); logFile.println(text); diff --git a/ESP32_AP-Flasher/src/tag_db.cpp b/ESP32_AP-Flasher/src/tag_db.cpp index e0bdf4e6..aea3ee19 100644 --- a/ESP32_AP-Flasher/src/tag_db.cpp +++ b/ESP32_AP-Flasher/src/tag_db.cpp @@ -5,7 +5,7 @@ #include #include -#include "LittleFS.h" +#include "storage.h" #include "language.h" std::vector tagDB; @@ -126,8 +126,8 @@ void saveDB(String filename) { long t = millis(); - LittleFS.begin(); - fs::File file = LittleFS.open(filename, "w"); + Storage.begin(); + fs::File file = contentFS->open(filename, "w"); if (!file) { Serial.println("saveDB: Failed to open file"); return; @@ -161,8 +161,8 @@ void loadDB(String filename) { Serial.println("reading DB from file"); long t = millis(); - LittleFS.begin(); - fs::File readfile = LittleFS.open(filename, "r"); + Storage.begin(); + fs::File readfile = contentFS->open(filename, "r"); if (!readfile) { Serial.println("loadDB: Failed to open file"); return; @@ -264,9 +264,9 @@ void clearPending(tagRecord* taginfo) { } void initAPconfig() { - LittleFS.begin(true); + Storage.begin(); DynamicJsonDocument APconfig(500); - File configFile = LittleFS.open("/current/apconfig.json", "r"); + File configFile = contentFS->open("/current/apconfig.json", "r"); if (configFile) { DeserializationError error = deserializeJson(APconfig, configFile); if (error) { @@ -285,7 +285,7 @@ void initAPconfig() { } void saveAPconfig() { - fs::File configFile = LittleFS.open("/current/apconfig.json", "w"); + fs::File configFile = contentFS->open("/current/apconfig.json", "w"); DynamicJsonDocument APconfig(500); APconfig["channel"] = config.channel; APconfig["alias"] = config.alias; diff --git a/ESP32_AP-Flasher/src/web.cpp b/ESP32_AP-Flasher/src/web.cpp index 6eec2bfb..5432cb5e 100644 --- a/ESP32_AP-Flasher/src/web.cpp +++ b/ESP32_AP-Flasher/src/web.cpp @@ -6,7 +6,8 @@ #include #include #include -#include +#include "storage.h" +#include "LittleFS.h" #include #include #include // https://github.com/tzapu/WiFiManager/tree/feature_asyncwebserver @@ -215,15 +216,7 @@ uint8_t wsClientCount() { } void init_web() { - LittleFS.begin(true); - - if (!LittleFS.exists("/current")) { - LittleFS.mkdir("/current"); - } - if (!LittleFS.exists("/temp")) { - LittleFS.mkdir("/temp"); - } - + Storage.begin(); WiFi.mode(WIFI_STA); WiFiManager wm; @@ -243,8 +236,8 @@ void init_web() { Serial.print("Connected! IP address: "); Serial.println(WiFi.localIP()); - // server.addHandler(new SPIFFSEditor(LittleFS, http_username, http_password)); - server.addHandler(new SPIFFSEditor(LittleFS)); + // server.addHandler(new SPIFFSEditor(*contentFS, http_username, http_password)); + server.addHandler(new SPIFFSEditor(*contentFS)); ws.onEvent(onEvent); server.addHandler(&ws); @@ -260,8 +253,8 @@ void init_web() { ESP.restart(); }); - server.serveStatic("/current", LittleFS, "/current/"); - server.serveStatic("/", LittleFS, "/www/").setDefaultFile("index.html"); + server.serveStatic("/current", *contentFS, "/current/"); + server.serveStatic("/", *contentFS, "/www/").setDefaultFile("index.html"); server.on( "/imgupload", HTTP_POST, [](AsyncWebServerRequest *request) { @@ -371,7 +364,7 @@ void init_web() { server.on("/get_ap_config", HTTP_GET, [](AsyncWebServerRequest *request) { UDPcomm udpsync; udpsync.getAPList(); - File configFile = LittleFS.open("/current/apconfig.json", "r"); + File configFile = contentFS->open("/current/apconfig.json", "r"); if (!configFile) { request->send(500, "text/plain", "Error opening apconfig.json file"); return; @@ -411,7 +404,7 @@ void init_web() { server.on("/backup_db", HTTP_GET, [](AsyncWebServerRequest *request) { saveDB("/current/tagDB.json"); - File file = LittleFS.open("/current/tagDB.json", "r"); + File file = contentFS->open("/current/tagDB.json", "r"); AsyncWebServerResponse *response = request->beginResponse(file, "tagDB.json", String(), true); request->send(response); file.close(); @@ -449,7 +442,7 @@ void doImageUpload(AsyncWebServerRequest *request, String filename, size_t index } else { filename = "unknown.jpg"; } - request->_tempFile = LittleFS.open("/" + filename, "w"); + request->_tempFile = contentFS->open("/" + filename, "w"); } if (len) { // stream the incoming chunk to the opened file From 9c83d8b5a5d782162d5b4e5efb07347fcf337949 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Mon, 19 Jun 2023 16:42:36 +0200 Subject: [PATCH 4/8] Use SDCard usage where available When an SD Card is available it is the more interesing metric in terms of space usage. We are therefore using it here. Signed-off-by: Mimoja --- ESP32_AP-Flasher/include/storage.h | 1 + ESP32_AP-Flasher/src/storage.cpp | 9 +++++++-- ESP32_AP-Flasher/src/web.cpp | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ESP32_AP-Flasher/include/storage.h b/ESP32_AP-Flasher/include/storage.h index a55dab09..9cd265d9 100644 --- a/ESP32_AP-Flasher/include/storage.h +++ b/ESP32_AP-Flasher/include/storage.h @@ -26,6 +26,7 @@ class DynStorage { DynStorage(); void begin(); void listFiles(); + size_t freeSpace(); private: bool isInited; diff --git a/ESP32_AP-Flasher/src/storage.cpp b/ESP32_AP-Flasher/src/storage.cpp index f923ac0e..fe40ccb6 100644 --- a/ESP32_AP-Flasher/src/storage.cpp +++ b/ESP32_AP-Flasher/src/storage.cpp @@ -44,8 +44,13 @@ static void initSDCard() { } #endif -void copyToSD(FS &sourceFS, const char* source_path){ - File root = sourceFS.open(source_path); +size_t DynStorage::freeSpace(){ + this->begin(); +#ifdef HAS_SDCARD + return SD.totalBytes() - SD.usedBytes(); +#endif + return LittleFS.totalBytes() - LittleFS.usedBytes(); +} void copyFile(File in, File out) { Serial.print("Copying "); diff --git a/ESP32_AP-Flasher/src/web.cpp b/ESP32_AP-Flasher/src/web.cpp index 5432cb5e..cff410b4 100644 --- a/ESP32_AP-Flasher/src/web.cpp +++ b/ESP32_AP-Flasher/src/web.cpp @@ -136,7 +136,7 @@ void wsSendSysteminfo() { sys["heap"] = ESP.getFreeHeap(); sys["recordcount"] = tagDB.size(); sys["dbsize"] = tagDB.size() * sizeof(tagRecord); - sys["littlefsfree"] = LittleFS.totalBytes() - LittleFS.usedBytes(); + sys["littlefsfree"] = Storage.freeSpace(); sys["apstate"] = apInfo.state; sys["runstate"] = config.runStatus; From 48b2925b9fd6c6e903bb19ec63d37103ffb38597 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Mon, 19 Jun 2023 16:43:20 +0200 Subject: [PATCH 5/8] Reset flasher if it shared the pins with the SDCard If the flasher and the SDCard share pins the ESP will need to be reset to bring VSPI and HSPI back into sane states. Trying to reinit them without a reset will lead to heap corruptions. Better safe than sorry. Signed-off-by: Mimoja --- ESP32_AP-Flasher/src/serialap.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ESP32_AP-Flasher/src/serialap.cpp b/ESP32_AP-Flasher/src/serialap.cpp index db249e6a..80c6525e 100644 --- a/ESP32_AP-Flasher/src/serialap.cpp +++ b/ESP32_AP-Flasher/src/serialap.cpp @@ -748,6 +748,15 @@ void APTask(void* parameter) { #endif Serial.println("Please verify your wiring and try again!"); } +#ifdef HAS_SDCARD + if (SD_CARD_CLK == FLASHER_AP_CLK || + SD_CARD_MISO == FLASHER_AP_MISO || + SD_CARD_MOSI == FLASHER_AP_MOSI) { + Serial.println("Reseting in 30 seconds to restore SPI state!\n"); + flashCountDown(30); + ESP.restart(); + } +#endif } uint8_t attempts = 0; From 93639ff8ace5cfcd37931705a761bd53508f95d7 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Mon, 19 Jun 2023 16:34:33 +0200 Subject: [PATCH 6/8] Disconnect SDCard if it shares the pins with the flasher Signed-off-by: Mimoja --- ESP32_AP-Flasher/include/storage.h | 1 + ESP32_AP-Flasher/src/flasher.cpp | 3 +++ ESP32_AP-Flasher/src/storage.cpp | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/ESP32_AP-Flasher/include/storage.h b/ESP32_AP-Flasher/include/storage.h index 9cd265d9..a1732e25 100644 --- a/ESP32_AP-Flasher/include/storage.h +++ b/ESP32_AP-Flasher/include/storage.h @@ -25,6 +25,7 @@ class DynStorage { public: DynStorage(); void begin(); + void end(); void listFiles(); size_t freeSpace(); diff --git a/ESP32_AP-Flasher/src/flasher.cpp b/ESP32_AP-Flasher/src/flasher.cpp index f1764caa..bd466201 100644 --- a/ESP32_AP-Flasher/src/flasher.cpp +++ b/ESP32_AP-Flasher/src/flasher.cpp @@ -3,6 +3,7 @@ #include #include #include "storage.h" +#include "LittleFS.h" #include // #include @@ -109,9 +110,11 @@ class flasher { flasher::flasher() { zbs = new ZBS_interface; + Storage.end(); } flasher::~flasher() { delete zbs; + Storage.begin(); } bool flasher::connectTag(uint8_t port) { diff --git a/ESP32_AP-Flasher/src/storage.cpp b/ESP32_AP-Flasher/src/storage.cpp index fe40ccb6..2cb5849f 100644 --- a/ESP32_AP-Flasher/src/storage.cpp +++ b/ESP32_AP-Flasher/src/storage.cpp @@ -141,6 +141,27 @@ void DynStorage::begin() { } } +void DynStorage::end() { +#ifdef HAS_SDCARD + initLittleFS(); + if (SD_CARD_CLK == FLASHER_AP_CLK || + SD_CARD_MISO == FLASHER_AP_MISO || + SD_CARD_MOSI == FLASHER_AP_MOSI) { + Serial.println("Tearing down SD card connection"); + + copyBetweenFS(*contentFS, "/tag_md5_db.json", LittleFS); + copyBetweenFS(*contentFS, "/AP_FW_Pack.bin", LittleFS); + if (contentFS->exists("/AP_force_flash.bin")) { + copyBetweenFS(*contentFS, "/AP_force_flash.bin", LittleFS); + contentFS->remove("/AP_force_flash.bin"); + } + Serial.println("Swapping to LittleFS"); + + contentFS = &LittleFS; + } + +#endif +} void listDir(fs::FS& fs, const char* dirname, uint8_t levels) { Storage.begin(); From dbf76e2176601b70ca3e988687271b85638ed4d5 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Mon, 19 Jun 2023 16:34:10 +0200 Subject: [PATCH 7/8] Expose flasher speed to config via define Signed-off-by: Mimoja --- ESP32_AP-Flasher/src/flasher.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ESP32_AP-Flasher/src/flasher.cpp b/ESP32_AP-Flasher/src/flasher.cpp index bd466201..adaa7ea6 100644 --- a/ESP32_AP-Flasher/src/flasher.cpp +++ b/ESP32_AP-Flasher/src/flasher.cpp @@ -117,18 +117,22 @@ flasher::~flasher() { Storage.begin(); } +#ifndef FLASHER_AP_SPEED +#define FLASHER_AP_SPEED 4000000 +#endif + bool flasher::connectTag(uint8_t port) { bool result; switch (port) { case 0: - result = zbs->begin(FLASHER_AP_SS, FLASHER_AP_CLK, FLASHER_AP_MOSI, FLASHER_AP_MISO, FLASHER_AP_RESET, (uint8_t *)powerPinsAP, sizeof(powerPinsAP), 8000000); + result = zbs->begin(FLASHER_AP_SS, FLASHER_AP_CLK, FLASHER_AP_MOSI, FLASHER_AP_MISO, FLASHER_AP_RESET, (uint8_t *)powerPinsAP, sizeof(powerPinsAP), FLASHER_AP_SPEED); break; #ifdef OPENEPAPERLINK_PCB case 1: - result = zbs->begin(FLASHER_EXT_SS, FLASHER_EXT_CLK, FLASHER_EXT_MOSI, FLASHER_EXT_MISO, FLASHER_EXT_RESET, (uint8_t *)powerPinsExt, sizeof(powerPinsExt), 8000000); + result = zbs->begin(FLASHER_EXT_SS, FLASHER_EXT_CLK, FLASHER_EXT_MOSI, FLASHER_EXT_MISO, FLASHER_EXT_RESET, (uint8_t *)powerPinsExt, sizeof(powerPinsExt), FLASHER_AP_SPEED); break; case 2: - result = zbs->begin(FLASHER_ALT_SS, FLASHER_ALT_CLK, FLASHER_ALT_MOSI, FLASHER_ALT_MISO, FLASHER_ALT_RESET, (uint8_t *)powerPinsAlt, sizeof(powerPinsAlt), 8000000); + result = zbs->begin(FLASHER_ALT_SS, FLASHER_ALT_CLK, FLASHER_ALT_MOSI, FLASHER_ALT_MISO, FLASHER_ALT_RESET, (uint8_t *)powerPinsAlt, sizeof(powerPinsAlt), FLASHER_AP_SPEED); break; #endif default: From 1e93a24b53f65057e7dbb6621f4bb3f7b1d58ac6 Mon Sep 17 00:00:00 2001 From: Mimoja Date: Mon, 19 Jun 2023 16:37:15 +0200 Subject: [PATCH 8/8] Allow the usage of SoftSPI for AP flashing The AP-Tags are not very fast at flashing. SoftSPI is fast enough for the rare flashing. This gives us the ability to move the AP connection to arbitrary pins. Signed-off-by: Mimoja --- ESP32_AP-Flasher/platformio.ini | 1 + ESP32_AP-Flasher/src/zbs_interface.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 0f51e22a..4e33a830 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -21,6 +21,7 @@ lib_deps = https://github.com/Bodmer/U8g2_for_TFT_eSPI https://github.com/ricmoo/qrcode fastled/FastLED + https://github.com/MajenkoLibraries/SoftSPI platform_packages = board_build.filesystem = littlefs diff --git a/ESP32_AP-Flasher/src/zbs_interface.cpp b/ESP32_AP-Flasher/src/zbs_interface.cpp index b19bcf91..13d5352b 100644 --- a/ESP32_AP-Flasher/src/zbs_interface.cpp +++ b/ESP32_AP-Flasher/src/zbs_interface.cpp @@ -7,6 +7,10 @@ #include #include +#ifdef USE_SOFTSPI + #include +#endif + #include "powermgt.h" uint8_t ZBS_interface::begin(uint8_t SS, uint8_t CLK, uint8_t MOSI, uint8_t MISO, uint8_t RESET, uint8_t* POWER, uint8_t powerPins, uint32_t spi_speed) { @@ -27,7 +31,12 @@ uint8_t ZBS_interface::begin(uint8_t SS, uint8_t CLK, uint8_t MOSI, uint8_t MISO digitalWrite(_CLK_PIN, LOW); digitalWrite(_MOSI_PIN, HIGH); +#ifdef USE_SOFTSPI + if (!spi) spi = new SoftSPI(_MOSI_PIN, _MISO_PIN, _CLK_PIN); +#else if (!spi) spi = new SPIClass(HSPI); +#endif + spiSettings = SPISettings(spi_speed, MSBFIRST, SPI_MODE0); spi_ready = 0;