Fixed a bug regarding colordepth change (#75)

meganetaaan · Jun 22, 2022 · bced49a · bced49a
1 parent 456de3c
commit bced49a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Avatar.cpp b/src/Avatar.cpp
@@ -113,6 +113,7 @@ void Avatar::start(int colorDepth) {
   if (_isDrawing) return;
   _isDrawing = true;
 
+  this->colorDepth = colorDepth;
   DriveContext *ctx = new DriveContext(this);
   // TODO(meganetaaan): keep handle of these tasks
   xTaskCreate(drawLoop,     /* Function to implement the task */

diff --git a/src/ColorPalette.cpp b/src/ColorPalette.cpp
@@ -10,7 +10,7 @@ ColorPalette::ColorPalette()
              {COLOR_SECONDARY, TFT_BLACK},
              {COLOR_BACKGROUND, TFT_BLACK}} {}
 
-uint32_t ColorPalette::get(const char* key) const {
+uint16_t ColorPalette::get(const char* key) const {
   auto itr = colors.find(key);
   if (itr != colors.end()) {
     return itr->second;
@@ -22,7 +22,7 @@ uint32_t ColorPalette::get(const char* key) const {
   }
 }
 
-void ColorPalette::set(const char* key, uint32_t value) {
+void ColorPalette::set(const char* key, uint16_t value) {
   auto itr = colors.find(key);
   if (itr != colors.end()) {
     Serial.println("Overwriting");

diff --git a/src/ColorPalette.h b/src/ColorPalette.h
@@ -24,8 +24,8 @@ namespace m5avatar {
 class ColorPalette {
  private:
   // ColorType colorType;
-  // uint32_t colors[2];
-  std::map<std::string, uint32_t> colors;
+  // uint16_t colors[2];
+  std::map<std::string, uint16_t> colors;
 
  public:
   // TODO(meganetaaan): constructor with color settings
@@ -34,8 +34,8 @@ class ColorPalette {
   ColorPalette(const ColorPalette &other) = default;
   ColorPalette &operator=(const ColorPalette &other) = default;
 
-  uint32_t get(const char *key) const;
-  void set(const char *key, uint32_t value);
+  uint16_t get(const char *key) const;
+  void set(const char *key, uint16_t value);
   void clear(void);
 };
 }  // namespace m5avatar