Changed the way BatteryIcon is displayed

Author: mongonta0716

src/Avatar.cpp

@@ -157,7 +157,7 @@ void Avatar::draw() {
   DrawContext *ctx = new DrawContext(this->expression, this->breath,
                                      &this->palette, g, this->eyeOpenRatio,
                                      this->mouthOpenRatio, this->speechText,
-                                     this->rotation, this->scale, this->colorDepth, this->batteryIcon, this->speechFont);
+                                     this->rotation, this->scale, this->colorDepth, this->batteryIcon, this->batteryLevel, this->speechFont);
   face->draw(ctx);
   delete ctx;
 }
@@ -216,4 +216,8 @@ void Avatar::setBatteryIcon(bool batteryIcon) {
   this->batteryIcon = batteryIcon;
 }
 
+void Avatar::setBatteryLevel(int32_t batteryLevel) {
+  this->batteryLevel = batteryLevel;
+}
+
 }  // namespace m5avatar

src/Avatar.h

@@ -24,8 +24,9 @@ class Avatar {
   ColorPalette palette;
   const char *speechText;
   int colorDepth;
-  const lgfx::IFont *speechFont;
   bool batteryIcon;
+  int32_t batteryLevel;
+  const lgfx::IFont *speechFont;
 
  public:
   Avatar();
@@ -59,6 +60,7 @@ class Avatar {
   void suspend();
   void resume();
   void setBatteryIcon(bool batteryIcon);
+  void setBatteryLevel(int32_t batteryLevel);
 };
 
 class DriveContext {

src/BatteryIcon.h

@@ -13,19 +13,10 @@ namespace m5avatar {
 
 class BatteryIcon final : public Drawable {
  private:
-  void drawBatteryIcon(M5Canvas *spi, uint32_t x, uint32_t y, uint16_t fgcolor, uint16_t bgcolor, float offset) {
-    //int32_t battery_level = M5.Power.getBatteryLevel();
-    //M5.Log.printf("batterylevel:%d\n", battery_level);
-//    if (M5.Power.isCharging()) {
-      //color = TFT_GREEN;
-    //} else {
-      //color = TFT_RED;
-    //}
-    //uint32_t battery_level = M5.Power.getBatteryLevel();
-    //M5.Log.printf("BatteryLevel:%d\n", battery_level);
+  void drawBatteryIcon(M5Canvas *spi, uint32_t x, uint32_t y, uint16_t fgcolor, uint16_t bgcolor, float offset, int32_t batteryLevel) {
     spi->drawRect(x, y + 5, 5, 5, fgcolor);
     spi->drawRect(x + 5, y, 30, 15, fgcolor);
-    int battery_width = 30 * (float)(M5.Power.getBatteryLevel() / 100.0f);
+    int battery_width = 30 * (float)(batteryLevel / 100.0f);
     spi->fillRect(x + 5 + 30 - battery_width, y, battery_width, 15, fgcolor);
   }
 
@@ -40,7 +31,8 @@ class BatteryIcon final : public Drawable {
       uint16_t primaryColor = ctx->getColorDepth() == 1 ? 1 : ctx->getColorPalette()->get(COLOR_PRIMARY);
       uint16_t bgColor = ctx->getColorDepth() == 1 ? ERACER_COLOR : ctx->getColorPalette()->get(COLOR_BACKGROUND);
       float offset = ctx->getBreath();
-      drawBatteryIcon(spi, 285, 5, primaryColor, bgColor, -offset);
+      int32_t batteryLevel = ctx->getBatteryLevel();
+      drawBatteryIcon(spi, 285, 5, primaryColor, bgColor, -offset, batteryLevel);
     }
   };
 

src/DrawContext.cpp

@@ -9,13 +9,13 @@ namespace m5avatar {
 DrawContext::DrawContext(Expression expression, float breath,
                          ColorPalette* const palette, Gaze gaze,
                          float eyeOpenRatio, float mouthOpenRatio,
-                         const char* speechText, bool batteryIcon, const lgfx::IFont* speechFont)
-    : DrawContext(expression, breath, palette, gaze, eyeOpenRatio, mouthOpenRatio, speechText, 0, 1, 1, false, speechFont){};
+                         const char* speechText, bool batteryIcon, int32_t batteryLevel, const lgfx::IFont* speechFont)
+    : DrawContext(expression, breath, palette, gaze, eyeOpenRatio, mouthOpenRatio, speechText, 0, 1, 1, false, 0, speechFont){};
 
 DrawContext::DrawContext(Expression expression, float breath,
                          ColorPalette* const palette, Gaze gaze,
                          float eyeOpenRatio, float mouthOpenRatio,
-                         const char* speechText, float rotation, float scale, int colorDepth, bool batteryIcon, const lgfx::IFont* speechFont) 
+                         const char* speechText, float rotation, float scale, int colorDepth, bool batteryIcon, int32_t batteryLevel, const lgfx::IFont* speechFont) 
     : expression{expression},
       breath{breath},
       eyeOpenRatio{eyeOpenRatio},
@@ -27,6 +27,7 @@ DrawContext::DrawContext(Expression expression, float breath,
       scale{scale},
       colorDepth{colorDepth},
       batteryIcon(batteryIcon),
+      batteryLevel(batteryLevel),
       speechFont{speechFont}{}
 
 Expression DrawContext::getExpression() const { return expression; }
@@ -53,4 +54,6 @@ const lgfx::IFont* DrawContext::getSpeechFont() const { return speechFont; }
 
 bool DrawContext::getBatteryIcon() const { return batteryIcon; }
 
+int32_t DrawContext::getBatteryLevel() const { return batteryLevel; }
+
 }  // namespace m5avatar

src/DrawContext.h

@@ -26,16 +26,17 @@ class DrawContext {
   float scale = 1.0;
   int colorDepth = 1;
   bool batteryIcon = true;
+  int32_t batteryLevel = 0;
   const lgfx::IFont* speechFont = nullptr; // = &fonts::lgfxJapanGothicP_16; //  = &fonts::efontCN_10;
 
  public:
   DrawContext() = delete;
   DrawContext(Expression expression, float breath, ColorPalette* const palette,
               Gaze gaze, float eyeOpenRatio, float mouthOpenRatio,
-              const char* speechText, bool batteryIcon, const lgfx::IFont* speechFont);
+              const char* speechText, bool batteryIcon, int32_t batteryLevel, const lgfx::IFont* speechFont);
   DrawContext(Expression expression, float breath, ColorPalette* const palette,
               Gaze gaze, float eyeOpenRatio, float mouthOpenRatio,
-              const char* speechText, float rotation, float scale, int colorDepth, bool batteryIcon, const lgfx::IFont* speechFont);
+              const char* speechText, float rotation, float scale, int colorDepth, bool batteryIcon, int32_t batteryLevel, const lgfx::IFont* speechFont);
   ~DrawContext() = default;
   DrawContext(const DrawContext& other) = delete;
   DrawContext& operator=(const DrawContext& other) = delete;
@@ -50,6 +51,7 @@ class DrawContext {
   const char* getspeechText() const;
   int getColorDepth() const;
   bool getBatteryIcon() const;
+  int32_t getBatteryLevel() const;
   const lgfx::IFont* getSpeechFont() const; 
 };
 }  // namespace m5avatar