mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into prerelease-15.2.0

Browse Source
This commit is contained in:
Theo Arends 2025-12-09 16:15:37 +01:00
commit 2c5041580b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib_display/UDisplay/include/uDisplay_config.h
View File

@ -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 };

2
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
View File

@ -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;