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-10 21:51:47 +01:00
commit 12668eab55
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasmota/displaydesc/Waveshare_2inch_ST7789_320x240_diplay.ini Normal file
View File

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

2
tasmota/tasmota_support/support.ino
View File

@ -2541,7 +2541,7 @@ void SyslogAsync(bool refresh) {
subStr(timestamp, line, " ", 1); // 00:00:02.096-026 subStr(timestamp, line, " ", 1); // 00:00:02.096-026
subStr(timestamp, timestamp, "-", 1); // 00:00:02.096 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 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 GetDate().c_str(), timestamp, GetTimeZone().c_str(), // 1970-01-01T00:00:02.096000+01:00
NetworkHostname()); NetworkHostname());