Merge pull request #130 from m5stack/develop

0.2.0
m5stack · Nov 8, 2024 · cf1aec3 · cf1aec3
2 parents da41430 + 2e81436
commit cf1aec3
Show file tree

Hide file tree

Showing 24 changed files with 897 additions and 265 deletions.
diff --git a/examples/Advanced/MP3_with_ESP8266Audio/MP3_with_ESP8266Audio.ino b/examples/Advanced/MP3_with_ESP8266Audio/MP3_with_ESP8266Audio.ino
@@ -469,7 +469,7 @@ void setup(void)
 
   while (false == SD.begin(GPIO_NUM_4, SPI, 25000000))
   {
-    delay(500);
+    M5.delay(500);
   }
 
   gfxSetup(&M5.Display);
@@ -487,7 +487,7 @@ void loop(void)
   }
   else
   {
-    delay(1);
+    M5.delay(1);
   }
 
   M5.update();

diff --git a/examples/Advanced/Speaker_SD_wav_file/Speaker_SD_wav_file.ino b/examples/Advanced/Speaker_SD_wav_file/Speaker_SD_wav_file.ino
@@ -126,6 +126,6 @@ void loop(void)
 {
   for (auto filename : files) {
     playSdWav(filename);
-    delay(500);
+    M5.delay(500);
   }
 }
diff --git a/examples/Advanced/WebRadio_with_ESP8266Audio/WebRadio_with_ESP8266Audio.ino b/examples/Advanced/WebRadio_with_ESP8266Audio/WebRadio_with_ESP8266Audio.ino
@@ -252,7 +252,7 @@ static void decodeTask(void*)
 {
   for (;;)
   {
-    delay(1);
+    M5.delay(1);
     if (playindex != ~0u)
     {
       auto index = playindex;
@@ -588,7 +588,7 @@ void setup(void)
   preallocateCodec = malloc(preallocateCodecSize);
   if (!preallocateBuffer || !preallocateCodec) {
     M5.Display.printf("FATAL ERROR:  Unable to preallocate %d bytes for app\n", preallocateBufferSize + preallocateCodecSize);
-    for (;;) { delay(1000); }
+    for (;;) { M5.delay(1000); }
   }
 
   { /// custom setting
@@ -616,7 +616,7 @@ void setup(void)
   // Try forever
   while (WiFi.status() != WL_CONNECTED) {
     M5.Display.print(".");
-    delay(100);
+    M5.delay(100);
   }
   M5.Display.clear();
 
@@ -636,7 +636,7 @@ void loop(void)
     int frame;
     do
     {
-      delay(1);
+      M5.delay(1);
     } while (prev_frame == (frame = millis() >> 3)); /// 8 msec cycle wait
     prev_frame = frame;
   }

diff --git a/examples/Basic/HowToUse/HowToUse.ino b/examples/Basic/HowToUse/HowToUse.ino
@@ -6,8 +6,15 @@
 // If you use SD card, write this.
 #include <SD.h>
 
+#if __has_include(<LittleFS.h>)
+// If you use LittleFS, write this.
+//  #include <LittleFS.h>
+#endif
+
+#if __has_include(<SPIFFS.h>)
 // If you use SPIFFS, write this.
-#include <SPIFFS.h>
+//  #include <SPIFFS.h>
+#endif
 
 #endif
 
@@ -275,6 +282,9 @@ void setup(void)
   case m5::board_t::board_M5AtomS3:
     name = "ATOMS3";
     break;
+  case m5::board_t::board_M5AtomS3R:
+    name = "ATOMS3R";
+    break;
   case m5::board_t::board_M5Dial:
     name = "Dial";
     break;
@@ -329,8 +339,14 @@ void setup(void)
   case m5::board_t::board_M5Station:
     name = "Station";
     break;
-  case m5::board_t::board_M5Atom:
-    name = "ATOM";
+  case m5::board_t::board_M5AtomLite:
+    name = "ATOM Lite";
+    break;
+  case m5::board_t::board_M5AtomMatrix:
+    name = "ATOM Matrix";
+    break;
+  case m5::board_t::board_M5AtomEcho:
+    name = "ATOM ECHO";
     break;
   case m5::board_t::board_M5AtomPsram:
     name = "ATOM PSRAM";

diff --git a/examples/Basic/Microphone/Microphone.ino b/examples/Basic/Microphone/Microphone.ino
@@ -12,10 +12,6 @@ static size_t rec_record_idx = 2;
 static size_t draw_record_idx = 0;
 static int16_t *rec_data;
 
-#if !defined ( ARDUINO )
- void delay(uint32_t msec) { vTaskDelay(msec / portTICK_PERIOD_MS ); }
-#endif
-
 void setup(void)
 {
   auto cfg = M5.config();
@@ -96,7 +92,7 @@ void loop(void)
     if (M5.Speaker.isEnabled())
     {
       M5.Display.clear();
-      while (M5.Mic.isRecording()) { delay(1); }
+      while (M5.Mic.isRecording()) { M5.delay(1); }
 
       /// Since the microphone and speaker cannot be used at the same time, turn off the microphone here.
       M5.Mic.end();
@@ -115,7 +111,7 @@ void loop(void)
       }
       do
       {
-        delay(1);
+        M5.delay(1);
         M5.update();
       } while (M5.Speaker.isPlaying());
 

diff --git a/examples/Basic/Rtc/Rtc.ino b/examples/Basic/Rtc/Rtc.ino
@@ -63,7 +63,7 @@ void setup(void)
   for (int i = 20; i && WiFi.status() != WL_CONNECTED; --i)
   {
     M5.Log.print(".");
-    delay(500);
+    M5.delay(500);
   }
   if (WiFi.status() == WL_CONNECTED) {
     M5.Log.println("\r\nWiFi Connected.");
@@ -72,10 +72,10 @@ void setup(void)
     while (sntp_get_sync_status() != SNTP_SYNC_STATUS_COMPLETED)
     {
       M5.Log.print(".");
-      delay(1000);
+      M5.delay(1000);
     }
 #else
-    delay(1600);
+    M5.delay(1600);
     struct tm timeInfo;
     while (!getLocalTime(&timeInfo, 1000))
     {
@@ -101,7 +101,7 @@ void loop(void)
 {
   static constexpr const char* const wd[7] = {"Sun","Mon","Tue","Wed","Thr","Fri","Sat"};
 
-  delay(500);
+  M5.delay(500);
 
   auto dt = M5.Rtc.getDateTime();
   M5.Display.setCursor(0,0);

diff --git a/library.json b/library.json
@@ -13,10 +13,10 @@
   "dependencies": [
     {
       "name": "M5GFX",
-      "version": ">=0.1.17"
+      "version": ">=0.2.0"
     }
   ],
-  "version": "0.1.17",
+  "version": "0.2.0",
   "frameworks": ["arduino", "espidf", "*"],
   "platforms": ["espressif32", "native"],
   "headers": "M5Unified.h"

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=M5Unified
-version=0.1.17
+version=0.2.0
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack/Core2/Tough/CoreS3/CoreS3SE, M5StickC/C-Plus/C-Plus2, M5CoreInk, M5Paper, M5ATOM, M5STAMP, M5Station, M5Dial, M5DinMeter, M5Capsule, M5Cardputer, M5VAMeter