sync (add nextion2text)

This commit is contained in:
joBr99
2022-11-03 19:06:19 +00:00
committed by github-actions[bot]
parent e83c25456d
commit ccbfb39607
17 changed files with 101 additions and 178 deletions

View File

@@ -12,153 +12,6 @@
│ - // fix touch offset │ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020 │ - lcd_dev fffb 0002 0000 0020
│ - page pageStartup │ - page pageStartup
├── cardAlarm.txt
│ @@ -671,19 +671,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ //text arm1
│ spstr strCommand.txt,arm1.txt,"~",3
│ if(arm1.txt!="")
│ {
│ vis arm1,1
│ }
│ //id arm1
├── cardEntities.txt
│ @@ -1253,19 +1253,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ // get Type
│ spstr strCommand.txt,type1.txt,"~",3
│ // get internal name
│ spstr strCommand.txt,entn1.txt,"~",4
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ vis bUp1,0
├── cardGrid.txt
│ @@ -680,19 +680,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ // get Type
│ spstr strCommand.txt,type1.txt,"~",3
│ // get internal name
│ spstr strCommand.txt,entn1.txt,"~",4
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ vis tEntity1,0
├── cardMedia.txt
│ @@ -628,19 +628,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ //entity name
│ spstr strCommand.txt,entn.txt,"~",3
│ //icon
│ spstr strCommand.txt,tIcon.txt,"~",4
│ //title
│ spstr strCommand.txt,tTitle.txt,"~",5
│ //author
├── cardPower.txt
│ @@ -586,19 +586,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ // icon color home
│ spstr strCommand.txt,tTmp.txt,"~",3
│ covx tTmp.txt,t1.pco,0,0
│ // icon home
│ spstr strCommand.txt,t1.txt,"~",4
│ // text home
│ spstr strCommand.txt,tHome.txt,"~",5
├── cardQR.txt
│ @@ -477,19 +477,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ //text qrcode
│ spstr strCommand.txt,vaQR.txt,"~",3
│ // get Type
│ spstr strCommand.txt,type1.txt,"~",4
│ // get internal name
│ spstr strCommand.txt,entn1.txt,"~",5
│ if(type1.txt=="delete"||type1.txt=="")
├── cardThermo.txt
│ @@ -925,19 +925,14 @@
│ }
│ if(tTmp.txt=="1")
│ {
│ vis bNext,1
│ tsw mSwipeNext,1
│ bNext.txt=""
│ }
│ - if(tTmp.txt=="2")
│ - {
│ - vis bNext,1
│ - bNext.txt=""
│ - }
│ //entity name
│ spstr strCommand.txt,entn.txt,"~",3
│ //currentTemp
│ spstr strCommand.txt,tCurTemp.txt,"~",4
│ //dstTemp
│ spstr strCommand.txt,tTmp.txt,"~",5
│ covx tTmp.txt,xTempDest1.val,0,0
├── pageStartup.txt ├── pageStartup.txt
│ @@ -173,15 +173,15 @@ │ @@ -173,15 +173,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10

View File

@@ -1258,6 +1258,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//text arm1 //text arm1
spstr strCommand.txt,arm1.txt,"~",3 spstr strCommand.txt,arm1.txt,"~",3
if(arm1.txt!="") if(arm1.txt!="")

View File

@@ -2210,6 +2210,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
// get Type // get Type
spstr strCommand.txt,type1.txt,"~",3 spstr strCommand.txt,type1.txt,"~",3
// get internal name // get internal name

View File

@@ -1130,6 +1130,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
// get Type // get Type
spstr strCommand.txt,type1.txt,"~",3 spstr strCommand.txt,type1.txt,"~",3
// get internal name // get internal name

View File

@@ -1064,6 +1064,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon

View File

@@ -1096,6 +1096,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
// icon color home // icon color home
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,t1.pco,0,0 covx tTmp.txt,t1.pco,0,0

View File

@@ -780,6 +780,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//text qrcode //text qrcode
spstr strCommand.txt,vaQR.txt,"~",3 spstr strCommand.txt,vaQR.txt,"~",3
// get Type // get Type

View File

@@ -1649,6 +1649,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp

View File

@@ -14,14 +14,14 @@ popupNotify
19 Component(s) 19 Component(s)
253 Line(s) of event code 253 Line(s) of event code
164 Unique line(s) of event code 164 Unique line(s) of event code
cardAlarm cardMedia
40 Component(s) 34 Component(s)
434 Line(s) of event code 406 Line(s) of event code
260 Unique line(s) of event code 216 Unique line(s) of event code
cardQR cardPower
32 Component(s) 43 Component(s)
416 Line(s) of event code 435 Line(s) of event code
241 Unique line(s) of event code 297 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
391 Line(s) of event code 391 Line(s) of event code
@@ -38,41 +38,41 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
cardGrid cardQR
42 Component(s) 32 Component(s)
485 Line(s) of event code 421 Line(s) of event code
285 Unique line(s) of event code 242 Unique line(s) of event code
cardMedia cardThermo
34 Component(s) 53 Component(s)
401 Line(s) of event code 608 Line(s) of event code
215 Unique line(s) of event code 316 Unique line(s) of event code
cardPower
43 Component(s)
430 Line(s) of event code
296 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
529 Line(s) of event code 529 Line(s) of event code
257 Unique line(s) of event code 257 Unique line(s) of event code
cardAlarm
40 Component(s)
439 Line(s) of event code
261 Unique line(s) of event code
cardEntities
65 Component(s)
1165 Line(s) of event code
530 Unique line(s) of event code
popupThermo popupThermo
44 Component(s) 44 Component(s)
515 Line(s) of event code 515 Line(s) of event code
272 Unique line(s) of event code 272 Unique line(s) of event code
cardGrid
42 Component(s)
490 Line(s) of event code
286 Unique line(s) of event code
screensaver screensaver
45 Component(s) 45 Component(s)
389 Line(s) of event code 389 Line(s) of event code
288 Unique line(s) of event code 288 Unique line(s) of event code
cardThermo
53 Component(s)
603 Line(s) of event code
315 Unique line(s) of event code
cardEntities
65 Component(s)
1160 Line(s) of event code
529 Unique line(s) of event code
Total Total
17 Page(s) 17 Page(s)
570 Component(s) 570 Component(s)
6944 Line(s) of event code 6979 Line(s) of event code
1795 Unique line(s) of event code 1796 Unique line(s) of event code

View File

@@ -675,6 +675,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//text arm1 //text arm1
spstr strCommand.txt,arm1.txt,"~",3 spstr strCommand.txt,arm1.txt,"~",3
if(arm1.txt!="") if(arm1.txt!="")

View File

@@ -1257,6 +1257,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
// get Type // get Type
spstr strCommand.txt,type1.txt,"~",3 spstr strCommand.txt,type1.txt,"~",3
// get internal name // get internal name

View File

@@ -684,6 +684,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
// get Type // get Type
spstr strCommand.txt,type1.txt,"~",3 spstr strCommand.txt,type1.txt,"~",3
// get internal name // get internal name

View File

@@ -632,6 +632,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon

View File

@@ -590,6 +590,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
// icon color home // icon color home
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,t1.pco,0,0 covx tTmp.txt,t1.pco,0,0

View File

@@ -481,6 +481,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//text qrcode //text qrcode
spstr strCommand.txt,vaQR.txt,"~",3 spstr strCommand.txt,vaQR.txt,"~",3
// get Type // get Type

View File

@@ -929,6 +929,11 @@ Timer tmSerial
tsw mSwipeNext,1 tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-11-03 18:55:21.474851026 +0000 +++ /dev/fd/62 2022-11-03 19:06:12.228899058 +0000
+14 +116,20 @@ +14 +116,20 @@
+e (string) strCommand +e (string) strCommand
+ Max. Text Size: 500 + Max. Text Size: 500