From ce67a505ca13c246c2fc34afe31bb7b1b1637a27 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 9 Dec 2025 11:29:29 +0100
Subject: [PATCH 1/2] fix possible redefine warning

---
 lib/lib_display/UDisplay/include/uDisplay_config.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/lib_display/UDisplay/include/uDisplay_config.h b/lib/lib_display/UDisplay/include/uDisplay_config.h
index d8210e387..d02c8c413 100644
--- a/lib/lib_display/UDisplay/include/uDisplay_config.h
+++ b/lib/lib_display/UDisplay/include/uDisplay_config.h
@@ -20,7 +20,9 @@ extern SPIClass *SpiBegin(uint32_t bus);
 #endif  // _TASMOTA_H_
 
 // Enable universal touch support
+#ifndef USE_UNIVERSAL_TOUCH
 #define USE_UNIVERSAL_TOUCH
+#endif
 
 enum uColorType { uCOLOR_BW, uCOLOR_COLOR };
 

From 89cbe5950bf0d11a96509ff1d8a870ea97c3955b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Tue, 9 Dec 2025 11:34:23 +0100
Subject: [PATCH 2/2] Fix regression from #24192

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

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
index d33cdcd1d..9c601e115 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
@@ -121,7 +121,7 @@ extern "C" {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 0 || (top == 1 && be_isint(vm, 1))) {  // only 1 argument of type string accepted
       uint32_t delay = 0;
-      if (top == 2) {
+      if (top == 1) {
         delay = be_toint(vm, 1);
       }
       uint32_t ret_millis = millis() + delay;