Merge pull request #2 from Forairaaaaa/update-m5gfx

Forairaaaaa · web-flow · commit 16348601828b · 2025-10-10T15:03:09.000+08:00
update to latest m5unified and m5gfx
diff --git a/main/hal/hal.h b/main/hal/hal.h
@@ -14,9 +14,9 @@ class Hal {
 public:
     void init();
 
-    M5GFX& display         = M5.Display;
-    m5::IMU_Class& imu     = M5.Imu;
-    m5::RTC8563_Class& rtc = M5.Rtc;
+    M5GFX& display     = M5.Display;
+    m5::IMU_Class& imu = M5.Imu;
+    m5::RTC_Class& rtc = M5.Rtc;
 
     /* -------------------------------------------------------------------------- */
     /*                                   System                                   */
diff --git a/main/main.cpp b/main/main.cpp
@@ -45,7 +45,7 @@ extern "C" void app_main(void)
     GetHAL().init();
 
     draw_gray_scale_bars();
-    GetHAL().delay(1000);
+    GetHAL().delay(3000);
 
     // Install apps
     GetMooncake().installApp(std::make_unique<AppPower>());
diff --git a/repos.json b/repos.json
@@ -2,12 +2,12 @@
     {
         "url": "https://github.com/m5stack/M5GFX.git",
         "path": "components/M5GFX",
-        "branch": "0.2.9"
+        "branch": "0.2.15"
     },
     {
         "url": "https://github.com/m5stack/M5Unified.git",
         "path": "components/M5Unified",
-        "branch": "0.2.7"
+        "branch": "0.2.10"
     },
     {
         "url": "https://github.com/Forairaaaaa/mooncake.git",
@@ -17,6 +17,6 @@
     {
         "url": "https://github.com/Forairaaaaa/mooncake_log.git",
         "path": "components/mooncake_log",
-        "branch": "v1.0.0"
+        "branch": "v1.3.0"
     }
 ]
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
@@ -7,5 +7,6 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_COMPILER_ORPHAN_SECTIONS_WARNING=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=6000
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
 CONFIG_LOG_COLORS=n

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`{`
`3`	`3`	`"url": "https://github.com/m5stack/M5GFX.git",`
`4`	`4`	`"path": "components/M5GFX",`
`5`		`- "branch": "0.2.9"`
	`5`	`+ "branch": "0.2.15"`
`6`	`6`	`},`
`7`	`7`	`{`
`8`	`8`	`"url": "https://github.com/m5stack/M5Unified.git",`
`9`	`9`	`"path": "components/M5Unified",`
`10`		`- "branch": "0.2.7"`
	`10`	`+ "branch": "0.2.10"`
`11`	`11`	`},`
`12`	`12`	`{`
`13`	`13`	`"url": "https://github.com/Forairaaaaa/mooncake.git",`
`@@ -17,6 +17,6 @@`
`17`	`17`	`{`
`18`	`18`	`"url": "https://github.com/Forairaaaaa/mooncake_log.git",`
`19`	`19`	`"path": "components/mooncake_log",`
`20`		`- "branch": "v1.0.0"`
	`20`	`+ "branch": "v1.3.0"`
`21`	`21`	`}`
`22`	`22`	`]`