fixed issue #19

lubeda · Jul 11, 2022 · 7334525 · 7334525
1 parent 26ea51a
commit 7334525
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/components/ehmtx/EHMTX.cpp b/components/ehmtx/EHMTX.cpp
@@ -131,7 +131,8 @@ namespace esphome
   {
     if (this->clock->now().timestamp > 6000) // valid time
     { 
-      if (!this->show_date or ((this->clock->now().timestamp - this->next_action_time) < this->clock_time))
+      time_t ts = this->clock->now().timestamp;
+      if (!this->show_date or ((this->next_action_time - ts) < this->clock_time))
       {
         this->display->strftime(this->xoffset + 15, this->yoffset, this->font, this->clock_color, display::TextAlign::BASELINE_CENTER, this->time_fmt.c_str(),
                                 this->clock->now());
@@ -203,8 +204,8 @@ namespace esphome
         }
         if (this->show_screen == false)
         {
-          ESP_LOGD(TAG, "next action: show clock for %d sec",this->screen_time);
-          this->last_clock_time = this->clock->now().timestamp;
+          ESP_LOGD(TAG, "next action: show clock/date for %d/%d sec",this->clock_time, this->screen_time-this->clock_time);
+          this->last_clock_time = ts;
           this->next_action_time = ts + this->screen_time;
         }
         else

diff --git a/components/ehmtx/EHMTX.h b/components/ehmtx/EHMTX.h
@@ -8,7 +8,7 @@ const uint8_t TEXTSCROLLSTART = 8;
 const uint8_t TEXTSTARTOFFSET = (32 - 8);
 
 const uint16_t TICKINTERVAL = 1000; // each 1000ms
-static const char *const EHMTX_VERSION = "Version: 2022.6.2";
+static const char *const EHMTX_VERSION = "Version: 2022.7.0";
 static const char *const TAG = "EHMTX";
 
 namespace esphome