Merge pull request #226 from andrewjswan/2024.4.0-Fix_for_Night_loop

2024.4.0: Fix for Night loop
lubeda · Apr 1, 2024 · c1abc70 · c1abc70
2 parents 6a0818f + f0a111b
commit c1abc70
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/components/ehmtxv2/EHMTX.cpp b/components/ehmtxv2/EHMTX.cpp
@@ -979,6 +979,11 @@ namespace esphome
  float last_time = this->get_tick();
  for (size_t i = 0; i < MAXQUEUE; i++)
  {
+ if (this->queue[i]->mode == MODE_EMPTY)
+ {
+ continue;
+ }
+
  if (this->night_mode)
  {
  bool skip = true;
@@ -1159,6 +1164,27 @@ namespace esphome
  uint8_t c = 0;
  for (size_t i = 0; i < MAXQUEUE; i++)
  {
+ if (this->queue[i]->mode == MODE_EMPTY)
+ {
+ continue;
+ }
+
+ if (this->night_mode)
+ {
+ bool skip = true;
+ for (auto id : EHMTXv2_CONF_NIGHT_MODE_SCREENS)
+ {
+ if (this->queue[i]->mode == id)
+ {
+ skip = false;
+ }
+ }
+ if (skip)
+ {
+ continue;
+ }
+ }
+
  if (this->queue[i]->endtime > ts)
  {
  c++;

diff --git a/components/ehmtxv2/EHMTX.h b/components/ehmtxv2/EHMTX.h
@@ -81,7 +81,7 @@ namespace esphome
  protected:
  float get_setup_priority() const override { return esphome::setup_priority::LATE; }
  uint8_t brightness_ = 0;
- uint8_t target_brightness_;
+ uint8_t target_brightness_ = 0;
  uint32_t boot_anim = 0;
  uint8_t screen_pointer;
  bool show_day_of_week;

diff --git a/components/ehmtxv2/__init__.py b/components/ehmtxv2/__init__.py
@@ -31,7 +31,7 @@
 SVG_END = "</svg>"
 
 logging.warning(f"")
-logging.warning(f"!!!!This version (2024.3.0) has breaking changes!!!!")
+logging.warning(f"!!!! This version (2024.4.0) has breaking changes !!!!")
 logging.warning(f"Please check the documentation and wiki https://github.com/lubeda/EspHoMaTriXv2")
 logging.warning(f"This will only work with esphome >= 2023.7.0")
 logging.warning(f"")
@@ -577,12 +577,21 @@ def thumbnails(frames):
  cg.add_define("EHMTXv2_SPECIAL_FONT_OFFSET_X",config[CONF_SPECIAL_FONT_XOFFSET])
  cg.add_define("EHMTXv2_SPECIAL_FONT_OFFSET_Y",config[CONF_SPECIAL_FONT_YOFFSET])
  cg.add_define("EHMTXv2_TIME_FORMAT",config[CONF_TIME_FORMAT])
- cg.add_define("EHMTXv2_TIME_FORMAT_BIG",config[CONF_TIME_FORMAT_BIG])
  cg.add_define("EHMTXv2_DATE_FORMAT",config[CONF_DATE_FORMAT])
- cg.add_define("EHMTXv2_DATE_FORMAT_BIG",config[CONF_DATE_FORMAT_BIG])
+
+ if config[CONF_TIME_FORMAT_BIG]:
+ cg.add_define("EHMTXv2_TIME_FORMAT_BIG",config[CONF_TIME_FORMAT_BIG])
+ else:
+ cg.add_define("EHMTXv2_TIME_FORMAT_BIG",config[EHMTXv2_TIME_FORMAT])
+
+ if config[CONF_DATE_FORMAT_BIG]:
+ cg.add_define("EHMTXv2_DATE_FORMAT_BIG",config[CONF_DATE_FORMAT_BIG])
+ else:
+ cg.add_define("EHMTXv2_DATE_FORMAT_BIG",config[CONF_DATE_FORMAT])
 
  if config[CONF_RAINBOWSHIMMER]:
  cg.add_define("EHMTXv2_RAINBOW_SHIMMER")
+ logging.info(f"[X] Rainbow shimmer")
 
  if config[CONF_SCROLL_SMALL_TEXT]:
  cg.add_define("EHMTXv2_SCROLL_SMALL_TEXT")
@@ -595,16 +604,20 @@ def thumbnails(frames):
 
  if config[CONF_VERTICAL]:
  cg.add_define("EHMTXv2_USE_VERTICAL_SCROLL")
+ logging.info(f"[X] Vertical scroll")
 
  if config[CONF_CLOCK]:
  cg.add_define("EHMTXv2_ADV_CLOCK")
+ logging.info(f"[X] Advanced clock mode")
 
  if config[CONF_BITMAP]:
  cg.add_define("EHMTXv2_ADV_BITMAP")
+ logging.info(f"[X] Advanced bitmap mode")
 
  if config.get(CONF_BOOTLOGO):
  cg.add(var.set_boot_logo(config[CONF_BOOTLOGO]))
  cg.add_define("EHMTXv2_ADV_BOOT") 
+ logging.info(f"[X] Advanced boot")
 
  if config[CONF_BOOTLOGOMODE] == 0:
  cg.add_define("EHMTXv2_ADV_BOOT_MODE_0")