From 04c90dc67d96da4b219e4b043cf32bf1e1c1ddc3 Mon Sep 17 00:00:00 2001
From: Alexey Baturin <baturin.alexey@gmail.com>
Date: Sat, 31 Dec 2022 12:45:59 +0100
Subject: [PATCH] Add alternative wiring of TM1650 (#17556)

303WIFILC01 model of clock used different wiring which needs remapping
---
 .../tasmota_xdsp_display/xdsp_20_tm1650.ino   | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/tasmota/tasmota_xdsp_display/xdsp_20_tm1650.ino b/tasmota/tasmota_xdsp_display/xdsp_20_tm1650.ino
index 2b2e3799a..1d7540895 100644
--- a/tasmota/tasmota_xdsp_display/xdsp_20_tm1650.ino
+++ b/tasmota/tasmota_xdsp_display/xdsp_20_tm1650.ino
@@ -72,6 +72,24 @@ static const byte TM1650Font[128] {
   0x73, 0x67, 0x50, 0x6D, 0x78, 0x1C, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x39, 0x30, 0x0F, 0x00, 0x00  // 0x70
 };
 
+const uint8_t TM1650Remap[] = {
+  0x00, 0x20, 0x80, 0xA0, 0x04, 0x24, 0x84, 0xA4, 0x08, 0x28, 0x88, 0xA8, 0x0C, 0x2C, 0x8C, 0xAC,
+  0x10, 0x30, 0x90, 0xB0, 0x14, 0x34, 0x94, 0xB4, 0x18, 0x38, 0x98, 0xB8, 0x1C, 0x3C, 0x9C, 0xBC,
+  0x40, 0x60, 0xC0, 0xE0, 0x44, 0x64, 0xC4, 0xE4, 0x48, 0x68, 0xC8, 0xE8, 0x4C, 0x6C, 0xCC, 0xEC,
+  0x50, 0x70, 0xD0, 0xF0, 0x54, 0x74, 0xD4, 0xF4, 0x58, 0x78, 0xD8, 0xF8, 0x5C, 0x7C, 0xDC, 0xFC,
+  0x02, 0x22, 0x82, 0xA2, 0x06, 0x26, 0x86, 0xA6, 0x0A, 0x2A, 0x8A, 0xAA, 0x0E, 0x2E, 0x8E, 0xAE,
+  0x12, 0x32, 0x92, 0xB2, 0x16, 0x36, 0x96, 0xB6, 0x1A, 0x3A, 0x9A, 0xBA, 0x1E, 0x3E, 0x9E, 0xBE,
+  0x42, 0x62, 0xC2, 0xE2, 0x46, 0x66, 0xC6, 0xE6, 0x4A, 0x6A, 0xCA, 0xEA, 0x4E, 0x6E, 0xCE, 0xEE,
+  0x52, 0x72, 0xD2, 0xF2, 0x56, 0x76, 0xD6, 0xF6, 0x5A, 0x7A, 0xDA, 0xFA, 0x5E, 0x7E, 0xDE, 0xFE,
+  0x01, 0x21, 0x81, 0xA1, 0x05, 0x25, 0x85, 0xA5, 0x09, 0x29, 0x89, 0xA9, 0x0D, 0x2D, 0x8D, 0xAD,
+  0x11, 0x31, 0x91, 0xB1, 0x15, 0x35, 0x95, 0xB5, 0x19, 0x39, 0x99, 0xB9, 0x1D, 0x3D, 0x9D, 0xBD,
+  0x41, 0x61, 0xC1, 0xE1, 0x45, 0x65, 0xC5, 0xE5, 0x49, 0x69, 0xC9, 0xE9, 0x4D, 0x6D, 0xCD, 0xED,
+  0x51, 0x71, 0xD1, 0xF1, 0x55, 0x75, 0xD5, 0xF5, 0x59, 0x79, 0xD9, 0xF9, 0x5D, 0x7D, 0xDD, 0xFD,
+  0x03, 0x23, 0x83, 0xA3, 0x07, 0x27, 0x87, 0xA7, 0x0B, 0x2B, 0x8B, 0xAB, 0x0F, 0x2F, 0x8F, 0xAF,
+  0x13, 0x33, 0x93, 0xB3, 0x17, 0x37, 0x97, 0xB7, 0x1B, 0x3B, 0x9B, 0xBB, 0x1F, 0x3F, 0x9F, 0xBF,
+  0x43, 0x63, 0xC3, 0xE3, 0x47, 0x67, 0xC7, 0xE7, 0x4B, 0x6B, 0xCB, 0xEB, 0x4F, 0x6F, 0xCF, 0xEF,
+  0x53, 0x73, 0xD3, 0xF3, 0x57, 0x77, 0xD7, 0xF7, 0x5B, 0x7B, 0xDB, 0xFB, 0x5F, 0x7F, 0xDF, 0xFF
+};
 
 /*********************************************************************************************/
 
@@ -213,6 +231,10 @@ void TM1650DisplayText (char *text)  // Text shall match regex (([^.]?\.?){0,4}\
         char c = *text++;
         TM1650Display[i] |= _BV(TM1650_DISPLAY_DOT);
       }
+
+      if (Settings->display_options.type == 2) {
+        TM1650Display[i] = TM1650Remap[TM1650Display[i]]; // 303WIFILC01 board has special wiring
+      }
     } // if (not at end of text)
     else { // No more text.
       TM1650Display[i] = 0;  // Clear digits after the text.
@@ -231,11 +253,18 @@ void TM1650Time(void)
 
   text[i++] = '0' + RtcTime.hour / 10;
   text[i++] = '0' + RtcTime.hour % 10;
-  text[i++] = '0' + RtcTime.minute / 10;
-  text[i++] = '.';  // Lower half of the colon, depending on how the LEDs are connected to the TM1650 in the XY-Clock.                    
-  text[i++] = '0' + RtcTime.minute % 10;
-  text[i++] = '.';  // Upper half of the colon.
-  text[i++] = 0;
+
+  if (Settings->display_options.type == 2) {
+    text[i++] = '.';  // Colon for 303WIFILC01
+    text[i++] = '0' + RtcTime.minute / 10;
+    text[i++] = '0' + RtcTime.minute % 10;
+  }
+  else {
+    text[i++] = '0' + RtcTime.minute / 10;
+    text[i++] = '.';  // Lower half of the colon, depending on how the LEDs are connected to the TM1650 in the XY-Clock.
+    text[i++] = '0' + RtcTime.minute % 10;
+    text[i++] = '.';  // Upper half of the colon.
+  }
 
   TM1650DisplayText(text);
 } // void TM1650Time(void)