From 352d4a4a3ed3ff9796c35d2dfc83fce45546daba Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 10 Dec 2025 14:02:24 +0100
Subject: [PATCH 1/2] Add configuration for Waveshare 2-inch ST7789 display

---
 .../Waveshare_2inch_ST7789_320x240_diplay.ini | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tasmota/displaydesc/Waveshare_2inch_ST7789_320x240_diplay.ini

diff --git a/tasmota/displaydesc/Waveshare_2inch_ST7789_320x240_diplay.ini b/tasmota/displaydesc/Waveshare_2inch_ST7789_320x240_diplay.ini
new file mode 100644
index 000000000..30a99f588
--- /dev/null
+++ b/tasmota/displaydesc/Waveshare_2inch_ST7789_320x240_diplay.ini
@@ -0,0 +1,21 @@
+:H,ST7789,320,240,16,SPI,1,*,*,*,*,*,*,*,40
+:S,2,1,1,0,80,30
+:I
+01,A0
+11,A0
+3A,81,55
+36,81,00
+21,80
+13,80
+29,A0
+:o,28
+:O,29
+:A,2A,2B,2C
+:R,36
+:0,A0,00,00,01
+:1,00,00,00,02
+:2,60,00,00,03
+:3,C0,00,00,00
+:i,21,20
+:D,50
+#

From 2c9d7b1176de5d35b8ee239b1e88da260de054b4 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 10 Dec 2025 21:18:49 +0100
Subject: [PATCH 2/2] Fix syslog format (#14689)

---
 tasmota/tasmota_support/support.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/tasmota_support/support.ino b/tasmota/tasmota_support/support.ino
index 6a04b6d7a..91e84dd46 100755
--- a/tasmota/tasmota_support/support.ino
+++ b/tasmota/tasmota_support/support.ino
@@ -2541,7 +2541,7 @@ void SyslogAsync(bool refresh) {
       subStr(timestamp, line, " ", 1);                        // 00:00:02.096-026
       subStr(timestamp, timestamp, "-", 1);                   // 00:00:02.096
 
-      snprintf_P(header, sizeof(header), PSTR("<%d>1 %s%s000%s %s tasmota - - -"),
+      snprintf_P(header, sizeof(header), PSTR("<%d>1 %s%s000%s %s tasmota - - - "),
         128 + min(loglevel * 3, 7),                           // Error (1) = 131, Info (2) = 134, Debug (3) = 135, DebugMore = (4) 135
         GetDate().c_str(), timestamp, GetTimeZone().c_str(),  // 1970-01-01T00:00:02.096000+01:00
         NetworkHostname());