From 25b4564a8b3337f8c2f4e821bc582cf977c391b9 Mon Sep 17 00:00:00 2001
From: Shaun Reed <shaunrd0@gmail.com>
Date: Sun, 16 Feb 2025 14:40:53 -0500
Subject: [PATCH] Fix ESP logging tags.

---
 esp/cpp/07_lcd-panel-i2c/main/display.cpp    | 3 +++
 esp/cpp/07_lcd-panel-i2c/main/i2c.h          | 7 ++++---
 esp/cpp/07_lcd-panel-i2c/main/panel.h        | 4 ++++
 esp/cpp/07_lcd-panel-i2c/main/panel_device.h | 3 +++
 esp/cpp/07_lcd-panel-i2c/main/ssd1306.h      | 3 +++
 esp/cpp/07_lcd-panel-i2c/main/time_keeper.h  | 7 +++++++
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/esp/cpp/07_lcd-panel-i2c/main/display.cpp b/esp/cpp/07_lcd-panel-i2c/main/display.cpp
index 1908328..b41e1ca 100644
--- a/esp/cpp/07_lcd-panel-i2c/main/display.cpp
+++ b/esp/cpp/07_lcd-panel-i2c/main/display.cpp
@@ -17,6 +17,9 @@ _lock_t Display::ScopedLock::lv_lock_;
 // Static TimeKeeper for managing ESP timers across all displays.
 TimeKeeper Display::timers_;
 
+/// Tag used for ESP logging.
+const char * TAG = "Display";
+
 Display::Display(IPanelDevice &device) :
     panel_(device),
     lv_buf_(nullptr)
diff --git a/esp/cpp/07_lcd-panel-i2c/main/i2c.h b/esp/cpp/07_lcd-panel-i2c/main/i2c.h
index 92c08e0..55c3f4f 100644
--- a/esp/cpp/07_lcd-panel-i2c/main/i2c.h
+++ b/esp/cpp/07_lcd-panel-i2c/main/i2c.h
@@ -5,9 +5,6 @@
 
 #include <driver/i2c_master.h>
 
-// TODO: Refactor tags for-each class.
-static const char *TAG = "lcd-panel";
-
 /**
  * Encapsulates ESP I2C creation and usage.
  */
@@ -68,6 +65,10 @@ struct I2C {
 
   /// RST GPIO pin number.
   int rst_num_;
+
+private:
+  /// Tag used for ESP logging.
+  const char * TAG = "I2C";
 };
 
 #endif //I2C_H
diff --git a/esp/cpp/07_lcd-panel-i2c/main/panel.h b/esp/cpp/07_lcd-panel-i2c/main/panel.h
index 792483e..30564be 100644
--- a/esp/cpp/07_lcd-panel-i2c/main/panel.h
+++ b/esp/cpp/07_lcd-panel-i2c/main/panel.h
@@ -53,6 +53,10 @@ struct Panel {
 
   /// ESP LCD panel configuration structure.
   esp_lcd_panel_dev_config_t esp_panel_config_;
+
+private:
+  /// Tag used for ESP logging.
+  const char * TAG = "Panel";
 };
 
 #endif //PANEL_H
diff --git a/esp/cpp/07_lcd-panel-i2c/main/panel_device.h b/esp/cpp/07_lcd-panel-i2c/main/panel_device.h
index f74145d..ed6c73c 100644
--- a/esp/cpp/07_lcd-panel-i2c/main/panel_device.h
+++ b/esp/cpp/07_lcd-panel-i2c/main/panel_device.h
@@ -146,6 +146,9 @@ private:
   virtual void init_panel(esp_lcd_panel_dev_config_t &config,
                           esp_lcd_panel_io_handle_t io,
                           esp_lcd_panel_handle_t &panel) = 0;
+
+  /// Tag used for ESP logging.
+  const char * TAG = "IPanelDevice";
 };
 
 #endif // PANEL_DEVICE_H
diff --git a/esp/cpp/07_lcd-panel-i2c/main/ssd1306.h b/esp/cpp/07_lcd-panel-i2c/main/ssd1306.h
index da12180..6415fba 100644
--- a/esp/cpp/07_lcd-panel-i2c/main/ssd1306.h
+++ b/esp/cpp/07_lcd-panel-i2c/main/ssd1306.h
@@ -102,6 +102,9 @@ private:
   {
     ESP_ERROR_CHECK(esp_lcd_new_panel_ssd1306(io, &config, &panel));
   }
+
+  /// Tag used for ESP logging.
+  const char * TAG = "SSD1306";
 };
 
 #endif // SSD1306_H
diff --git a/esp/cpp/07_lcd-panel-i2c/main/time_keeper.h b/esp/cpp/07_lcd-panel-i2c/main/time_keeper.h
index 3cf02b3..33d7335 100644
--- a/esp/cpp/07_lcd-panel-i2c/main/time_keeper.h
+++ b/esp/cpp/07_lcd-panel-i2c/main/time_keeper.h
@@ -41,6 +41,10 @@ struct Timer {
 
   /// ESP timer handle.
   esp_timer_handle_t esp_timer_;
+
+private:
+  /// Tag used for ESP logging.
+  const char * TAG = "Timer";
 };
 
 /**
@@ -126,6 +130,9 @@ struct TimeKeeper {
 private:
   /// Existing ESP timers created for this TimeKeeper instance.
   std::unordered_map<const char *, Timer> managed_timers_;
+
+  /// Tag used for ESP logging.
+  const char * TAG = "TimeKeeper";
 };
 
 #endif // TIME_KEEPER_H