Added a charge symbol to the battery icon.

Author: mongonta0716

src/Avatar.cpp

@@ -154,10 +154,22 @@ void Avatar::start(int colorDepth) {
 
 void Avatar::draw() {
   Gaze g = Gaze(this->gazeV, this->gazeH);
+  if (power != nullptr) {
+    if ((millis() - last_power_display_time) > 3000) {
+      // バッテリー残量の更新は3秒に一度
+      if (power->isCharging()) {
+        this->batteryIconStatus = BatteryIconStatus::isCharging;
+      } else {
+        this->batteryIconStatus = BatteryIconStatus::disCharge;
+      }
+      this->batteryLevel = power->getBatteryLevel();
+      last_power_display_time = millis();
+    }
+  }
   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->batteryLevel, this->speechFont);
+                                     this->rotation, this->scale, this->colorDepth, this->batteryIconStatus, this->batteryLevel, this->speechFont);
   face->draw(ctx);
   delete ctx;
 }
@@ -212,12 +224,15 @@ void Avatar::setSpeechFont(const lgfx::IFont *speechFont) {
   this->speechFont = speechFont;
 }
 
-void Avatar::setBatteryIcon(bool batteryIcon) {
-  this->batteryIcon = batteryIcon;
-}
-
-void Avatar::setBatteryLevel(int32_t batteryLevel) {
-  this->batteryLevel = batteryLevel;
+void Avatar::setM5PowerClass(m5::Power_Class* power) {
+  this->power = power;
+  if (power->isCharging()) {
+    this->batteryIconStatus = BatteryIconStatus::isCharging;
+  } else {
+    this->batteryIconStatus = BatteryIconStatus::disCharge;
+  }
+  this->batteryLevel = power->getBatteryLevel();
+  this->last_power_display_time = millis();
 }
 
 }  // namespace m5avatar

src/Avatar.h

@@ -24,9 +24,11 @@ class Avatar {
   ColorPalette palette;
   const char *speechText;
   int colorDepth;
-  bool batteryIcon;
+  BatteryIconStatus batteryIconStatus;
   int32_t batteryLevel;
   const lgfx::IFont *speechFont;
+  m5::Power_Class* power = nullptr;
+  uint64_t last_power_display_time = 0;
 
  public:
   Avatar();
@@ -59,10 +61,10 @@ class Avatar {
   void addTask(TaskFunction_t f, const char* name);
   void suspend();
   void resume();
-  void setBatteryIcon(bool batteryIcon);
-  void setBatteryLevel(int32_t batteryLevel);
+  void setM5PowerClass(m5::Power_Class* power);
 };
 
+
 class DriveContext {
  private:
   // TODO(meganetaaan): cyclic reference

src/BatteryIcon.h

@@ -13,12 +13,20 @@ 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 batteryLevel) {
+  void drawBatteryIcon(M5Canvas *spi, uint32_t x, uint32_t y, uint16_t fgcolor, uint16_t bgcolor, float offset, BatteryIconStatus batteryIconStatus, int32_t batteryLevel) {
     spi->drawRect(x, y + 5, 5, 5, fgcolor);
     spi->drawRect(x + 5, y, 30, 15, fgcolor);
     int battery_width = 30 * (float)(batteryLevel / 100.0f);
     spi->fillRect(x + 5 + 30 - battery_width, y, battery_width, 15, fgcolor);
-  }
+    if (batteryIconStatus == BatteryIconStatus::isCharging) {
+      spi->fillTriangle(x + 20, y, x + 15, y + 8, x + 20, y + 8, bgcolor);
+      spi->fillTriangle(x + 18, y + 7, x + 18, y + 15, x + 23, y + 7, bgcolor);
+      spi->drawLine(x + 20, y, x + 15, y + 8, fgcolor);
+      spi->drawLine(x + 20, y, x + 20, y + 7, fgcolor);
+      spi->drawLine(x + 18, y + 15, x + 23, y + 7, fgcolor);
+      spi->drawLine(x + 18, y + 8, x + 18, y + 15, fgcolor);
+    }
+ }
 
  public:
   // constructor
@@ -27,12 +35,12 @@ class BatteryIcon final : public Drawable {
   BatteryIcon(const BatteryIcon &other) = default;
   BatteryIcon &operator=(const BatteryIcon &other) = default;
   void draw(M5Canvas *spi, BoundingRect rect, DrawContext *ctx) override {
-    if (ctx->getBatteryIcon()) {
+    if (ctx->getBatteryIconStatus() != BatteryIconStatus::invisible) {
       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();
       int32_t batteryLevel = ctx->getBatteryLevel();
-      drawBatteryIcon(spi, 285, 5, primaryColor, bgColor, -offset, batteryLevel);
+      drawBatteryIcon(spi, 285, 5, primaryColor, bgColor, -offset, ctx->getBatteryIconStatus(), 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, int32_t batteryLevel, const lgfx::IFont* speechFont)
-    : DrawContext(expression, breath, palette, gaze, eyeOpenRatio, mouthOpenRatio, speechText, 0, 1, 1, false, 0, speechFont){};
+                         const char* speechText, BatteryIconStatus batteryIcon, int32_t batteryLevel, const lgfx::IFont* speechFont)
+    : DrawContext(expression, breath, palette, gaze, eyeOpenRatio, mouthOpenRatio, speechText, 0, 1, 1, BatteryIconStatus::invisible, 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, int32_t batteryLevel, const lgfx::IFont* speechFont) 
+                         const char* speechText, float rotation, float scale, int colorDepth, BatteryIconStatus batteryIconStatus, int32_t batteryLevel, const lgfx::IFont* speechFont) 
     : expression{expression},
       breath{breath},
       eyeOpenRatio{eyeOpenRatio},
@@ -26,7 +26,7 @@ DrawContext::DrawContext(Expression expression, float breath,
       rotation{rotation},
       scale{scale},
       colorDepth{colorDepth},
-      batteryIcon(batteryIcon),
+      batteryIconStatus(batteryIconStatus),
       batteryLevel(batteryLevel),
       speechFont{speechFont}{}
 
@@ -52,7 +52,7 @@ int DrawContext::getColorDepth() const { return colorDepth; }
 
 const lgfx::IFont* DrawContext::getSpeechFont() const { return speechFont; }
 
-bool DrawContext::getBatteryIcon() const { return batteryIcon; }
+BatteryIconStatus DrawContext::getBatteryIconStatus() const { return batteryIconStatus; }
 
 int32_t DrawContext::getBatteryLevel() const { return batteryLevel; }
 

src/DrawContext.h

@@ -12,7 +12,9 @@
 #include "Expression.h"
 #include "Gaze.h"
 
+
 namespace m5avatar {
+enum BatteryIconStatus { disCharge, isCharging, invisible };
 class DrawContext {
  private:
   Expression expression;
@@ -25,18 +27,18 @@ class DrawContext {
   float rotation = 0.0;
   float scale = 1.0;
   int colorDepth = 1;
-  bool batteryIcon = true;
+  BatteryIconStatus batteryIconStatus = BatteryIconStatus::invisible;
   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, int32_t batteryLevel, const lgfx::IFont* speechFont);
+              const char* speechText, BatteryIconStatus batteryIconStatus, 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, int32_t batteryLevel, const lgfx::IFont* speechFont);
+              const char* speechText, float rotation, float scale, int colorDepth, BatteryIconStatus batteryIconStatus, int32_t batteryLevel, const lgfx::IFont* speechFont);
   ~DrawContext() = default;
   DrawContext(const DrawContext& other) = delete;
   DrawContext& operator=(const DrawContext& other) = delete;
@@ -50,7 +52,7 @@ class DrawContext {
   ColorPalette* const getColorPalette() const;
   const char* getspeechText() const;
   int getColorDepth() const;
-  bool getBatteryIcon() const;
+  BatteryIconStatus getBatteryIconStatus() const;
   int32_t getBatteryLevel() const;
   const lgfx::IFont* getSpeechFont() const; 
 };