From e4a640844ccdf9f9df6aff8adbfdd022a947699a Mon Sep 17 00:00:00 2001
From: Pavlo Dudnytskyi <paveldudn@gmail.com>
Date: Wed, 12 Jul 2023 22:24:49 +0200
Subject: [PATCH] Fixing colon for tm1637 display if inverted set true (#5072)

---
 esphome/components/tm1637/tm1637.cpp | 29 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/esphome/components/tm1637/tm1637.cpp b/esphome/components/tm1637/tm1637.cpp
index 434c6e65f3..8d7630bd1d 100644
--- a/esphome/components/tm1637/tm1637.cpp
+++ b/esphome/components/tm1637/tm1637.cpp
@@ -300,6 +300,7 @@ uint8_t TM1637Display::read_byte_() {
 uint8_t TM1637Display::print(uint8_t start_pos, const char *str) {
   // ESP_LOGV(TAG, "Print at %d: %s", start_pos, str);
   uint8_t pos = start_pos;
+  bool use_dot = false;
   for (; *str != '\0'; str++) {
     uint8_t data = TM1637_UNKNOWN_CHAR;
     if (*str >= ' ' && *str <= '~')
@@ -312,14 +313,14 @@ uint8_t TM1637Display::print(uint8_t start_pos, const char *str) {
     // XABCDEFG, but TM1637 is // XGFEDCBA
     if (this->inverted_) {
       // XABCDEFG > XGCBAFED
-      data = ((data & 0x80) ? 0x80 : 0) |  // no move X
-             ((data & 0x40) ? 0x8 : 0) |   // A
-             ((data & 0x20) ? 0x10 : 0) |  // B
-             ((data & 0x10) ? 0x20 : 0) |  // C
-             ((data & 0x8) ? 0x1 : 0) |    // D
-             ((data & 0x4) ? 0x2 : 0) |    // E
-             ((data & 0x2) ? 0x4 : 0) |    // F
-             ((data & 0x1) ? 0x40 : 0);    // G
+      data = ((data & 0x80) || use_dot ? 0x80 : 0) |  // no move X
+             ((data & 0x40) ? 0x8 : 0) |              // A
+             ((data & 0x20) ? 0x10 : 0) |             // B
+             ((data & 0x10) ? 0x20 : 0) |             // C
+             ((data & 0x8) ? 0x1 : 0) |               // D
+             ((data & 0x4) ? 0x2 : 0) |               // E
+             ((data & 0x2) ? 0x4 : 0) |               // F
+             ((data & 0x1) ? 0x40 : 0);               // G
     } else {
       // XABCDEFG > XGFEDCBA
       data = ((data & 0x80) ? 0x80 : 0) |  // no move X
@@ -331,18 +332,18 @@ uint8_t TM1637Display::print(uint8_t start_pos, const char *str) {
              ((data & 0x2) ? 0x20 : 0) |   // F
              ((data & 0x1) ? 0x40 : 0);    // G
     }
-    if (*str == '.') {
-      if (pos != start_pos)
-        pos--;
-      this->buffer_[pos] |= 0b10000000;
+    use_dot = *str == '.';
+    if (use_dot) {
+      if ((!this->inverted_) && (pos != start_pos)) {
+        this->buffer_[pos - 1] |= 0b10000000;
+      }
     } else {
       if (pos >= 6) {
         ESP_LOGE(TAG, "String is too long for the display!");
         break;
       }
-      this->buffer_[pos] = data;
+      this->buffer_[pos++] = data;
     }
-    pos++;
   }
   return pos - start_pos;
 }