Merge pull request #163 from tobozo/1.1.6

1.1.6

.github/workflows/LibraryBuild.yml

@@ -77,7 +77,7 @@ jobs:
       - name: ${{ matrix.matrix-context }}
         uses: ArminJo/arduino-test-compile@v3
         with:
-          platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
+          platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json
           arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
           required-libraries: ${{ matrix.required-libraries }}
           extra-arduino-lib-install-args: --no-deps

.gitignore

@@ -1 +1,2 @@
 build
+.pio/

examples/Headless/Headless.ino

@@ -1,11 +1,12 @@
-#define SDU_APP_NAME "Headless() Example"
+#define SDU_APP_NAME "Headless Example"
+#define SDU_APP_PATH "/Headless_Example.bin"
 #define SDU_HEADLESS     // don't load gfx clutter (but implement my own action trigger)
 #define TFCARD_CS_PIN 4  // this is needed by SD.begin()
 #include <SD.h>          // /!\ headless mode skips autodetect and may require to include the filesystem library **before** the M5StackUpdater library
 #include <M5StackUpdater.h>
 
 
-static int myActionTrigger( char* labelLoad,  char* labelSkip, unsigned long waitdelay )
+static int myActionTrigger( char* labelLoad,  char* labelSkip, char* labelSave, unsigned long waitdelay )
 {
   int64_t msec = millis();
   do {
@@ -14,6 +15,7 @@ static int myActionTrigger( char* labelLoad,  char* labelSkip, unsigned long wai
       if(      out == "update" )  return  1; // load "/menu.bin"
       else if( out == "rollback") return  0; // rollback to other OTA partition
       else if( out == "skip" )    return -1; // do nothing
+      else if( out == "save" ) return 2;
       else Serial.printf("Ignored command: %s\n", out.c_str() );
     }
   } while( msec > int64_t( millis() ) - int64_t( waitdelay ) );
@@ -25,25 +27,24 @@ void setup()
 {
   Serial.begin( 115200 );
   Serial.println("Welcome to the SD-Updater Headless example!");
-  Serial.println("Now checking if a button was pushed during boot ...");
+  Serial.println("Now waiting 30 seconds for user input in Serial console...");
 
   SDUCfg.setWaitForActionCb( myActionTrigger );
-  checkSDUpdater( SD );
-/*
+
   checkSDUpdater(
     SD,           // filesystem (default=SD)
     MENU_BIN,     // path to binary (default=/menu.bin, empty string=rollback only)
     30000,        // wait delay in milliseconds (default=0, e,g, 30000 will be forced to 30 seconds upon ESP.restart() )
     TFCARD_CS_PIN // (usually default=4 but your mileage may vary)
   );
-*/
-  Serial.println("Nope, will run the sketch normally");
+
+  Serial.println("Starting application");
+
 
 }
 
 void loop()
 {
 
 
-
 }

examples/M5Stack-SD-Menu/M5Stack-SD-Menu.ino

@@ -77,43 +77,6 @@
  *
  */
 
-#include "menu.h"
+#include "main/main.cpp"
 
 
-
-void setup() {
-  #if defined(_CHIMERA_CORE_)
-    M5.begin(true, false, true, false, false); // bool LCDEnable, bool SDEnable, bool SerialEnable, bool I2CEnable, bool ScreenShotEnable
-  #else
-    M5.begin(); // bool LCDEnable, bool SDEnable, bool SerialEnable, bool I2CEnable, bool ScreenShotEnable
-  #endif
-
-  sdUpdater = new SDUpdater();
-  // suggest rollback
-  sdUpdater->checkSDUpdaterUI(
-    SD,           // filesystem (default=SD)
-    "",           // path to binary (default = /menu.bin, empty = rollback only)
-    0            // wait delay, (default=0, will be forced to 2000 upon ESP.restart() )
-  );
-
-  #if defined(_CHIMERA_CORE_)
-    // debug I2C
-    //Wire.begin(SDA, SCL);
-    //M5.I2C.scan();
-  #endif
-
-  //WiFi.onEvent(WiFiEvent); // helps debugging WiFi problems with the Serial console
-  UISetup(); // UI init and check if a SD exists
-
-  doFSChecks(); // replicate on SD and app1 partition, scan data folder, load registry
-  doFSInventory(); // enumerate apps and render menu
-
-}
-
-
-void loop() {
-
-  HIDMenuObserve();
-  sleepTimer();
-
-}