Merge remote-tracking branch 'Tasmota/development' into work

github-actions[bot] · github-actions[bot] · commit e133423b2091 · 2025-12-09T10:59:21.000Z
diff --git 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 };
 
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ extern "C" {`
`121`	`121`	`int32_t top = be_top(vm); // Get the number of arguments`
`122`	`122`	`if (top == 0 \|\| (top == 1 && be_isint(vm, 1))) { // only 1 argument of type string accepted`
`123`	`123`	`uint32_t delay = 0;`
`124`		`- if (top == 2) {`
	`124`	`+ if (top == 1) {`
`125`	`125`	`delay = be_toint(vm, 1);`
`126`	`126`	`}`
`127`	`127`	`uint32_t ret_millis = millis() + delay;`