Merge pull request #29 from Forairaaaaa/fix-bat-level-reading

Fix bat level reading

Author: Forairaaaaa

main/apps/app_launcher/app_launcher.h

@@ -39,8 +39,9 @@ class Launcher : public mooncake::AppAbility {
         // 1 ~ 5
         uint8_t wifi_state = 5;
         // 1 ~ 4
-        uint8_t bat_state = 1;
-        std::string time  = "12:34";
+        uint8_t bat_state     = 1;
+        std::string bat_level = "100%";
+        std::string time      = "12:34";
     };
 
     struct Data_t {

main/apps/app_launcher/view/system_bar/system_bar.cpp

@@ -45,8 +45,10 @@ void Launcher::render_system_bar()
 
     // Bat
     if ((GetHAL().millis() - _data.bat_update_time_count) > 5000 || _data.bat_update_time_count == 0) {
-        auto bat_level = GetHAL().getBatLevel();
+        auto bat_level               = GetHAL().getBatLevel();
+        _data.system_state.bat_level = fmt::format("{}", bat_level);
         // mclog::tagInfo("system_bar", "get bat level: {}", bat_level);
+        // printf("b:%d\n", bat_level);
 
         if (bat_level >= 100) {
             _data.system_state.bat_state = 1;
@@ -94,7 +96,7 @@ void Launcher::render_system_bar()
         GetHAL().canvasSystemBar.pushImage(x, y, 16, 16, image_data_wifi5);
     }
 
-    // Bat
+    // Bat icon
     x = GetHAL().canvasSystemBar.width() - 45;
     y = 5;
 
@@ -108,6 +110,12 @@ void Launcher::render_system_bar()
         GetHAL().canvasSystemBar.pushImage(x, y, 32, 16, image_data_bat4);
     }
 
+    // Bat level
+    GetHAL().canvasSystemBar.setFont(&fonts::Font0);
+    GetHAL().canvasSystemBar.setTextColor((uint32_t)0x000000);
+    GetHAL().canvasSystemBar.drawCenterString(_data.system_state.bat_level.c_str(), 176,
+                                              GetHAL().canvasSystemBar.height() / 2 - 3);
+
     // Push
     GetHAL().pushCanvasSystemBar();
 }

main/apps/utils/common.h

@@ -6,7 +6,7 @@
 #pragma once
 #include <hal/hal.h>
 
-#define FW_VERSION "V0.1"
+#define FW_VERSION "V0.2"
 
 #define ANIM_APP_OPEN()                                                                                     \
     for (int i = 10; i < 123; i += 8) {                                                                     \

repos.json

@@ -2,12 +2,12 @@
     {
         "url": "https://github.com/m5stack/M5GFX.git",
         "path": "components/M5GFX",
-        "branch": "0.2.10"
+        "branch": "0.2.15"
     },
     {
         "url": "https://github.com/m5stack/M5Unified.git",
         "path": "components/M5Unified",
-        "branch": "0.2.8"
+        "branch": "0.2.10"
     },
     {
         "url": "https://github.com/Forairaaaaa/mooncake.git",