2023.9.1: Add screen id for bitmap screen to events and log

andrewjswan · Dec 24, 2023 · 4bf4e4d · 4bf4e4d
1 parent 5fd3afa
commit 4bf4e4d
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/components/ehmtxv2/EHMTX.cpp b/components/ehmtxv2/EHMTX.cpp
@@ -289,9 +289,19 @@ namespace esphome
       screen->pixels_ = 0;
       screen->scroll_reset = 32;
     #endif
-    for (auto *t : on_add_screen_triggers_)
+    if (id == "")
     {
-      t->process("bitmap", (uint8_t)screen->mode);
+      for (auto *t : on_add_screen_triggers_)
+      {
+        t->process("bitmap", (uint8_t)screen->mode);
+      }
+    }
+    else
+    {
+      for (auto *t : on_add_screen_triggers_)
+      {
+        t->process("bitmap: " + id, (uint8_t)screen->mode);
+      }
     }
     ESP_LOGD(TAG, "bitmap screen: lifetime: %d screen_time: %d", lifetime, screen_time);
     screen->status();
@@ -1016,7 +1026,7 @@ namespace esphome
                 infotext = ("bitmap small: " + this->queue[i]->icon_name).c_str();
                 break;
               case MODE_BITMAP_SCREEN:
-                infotext = "bitmap";
+                infotext = ("bitmap: " + this->queue[i]->icon_name).c_str();
                 break;
               case MODE_BITMAP_STACK_SCREEN:
                 infotext = ("bitmap stack: " + this->queue[i]->text).c_str();
@@ -1195,7 +1205,7 @@ namespace esphome
                 infotext = ("bitmap small: " + this->queue[this->screen_pointer]->icon_name).c_str();
                 break;
               case MODE_BITMAP_SCREEN:
-                infotext = "bitmap";
+                infotext = ("bitmap: " + this->queue[this->screen_pointer]->icon_name).c_str();
                 break;
               case MODE_BITMAP_STACK_SCREEN:
                 infotext = ("bitmap stack: " + this->queue[this->screen_pointer]->text).c_str();