Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-09-18 15:58:55 +00:00
committed by github-actions[bot]
parent a59f8d6d83
commit 6821ff8862
28 changed files with 796 additions and 48 deletions

View File

@@ -27,6 +27,26 @@
│ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ - page pageStartup
├── cardAlarm.txt
│ @@ -833,18 +833,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardEntities.txt
│ @@ -782,15 +782,15 @@
│ Attributes
@@ -96,6 +116,105 @@
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -1886,18 +1886,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── cardGrid.txt
│ @@ -838,18 +838,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── cardMedia.txt
│ @@ -751,18 +751,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardQR.txt
│ @@ -702,18 +702,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardThermo.txt
│ @@ -1138,18 +1138,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── pageStartup.txt
│ @@ -173,15 +173,15 @@
│ Max. Text Size : 10
@@ -262,3 +381,103 @@
│ - }
│ - }
│ -
├── popupFan.txt
│ @@ -623,18 +623,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupLight.txt
│ @@ -659,18 +659,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupNotify.txt
│ @@ -406,18 +406,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupShutter.txt
│ @@ -685,18 +685,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── screensaver.txt
│ @@ -683,18 +683,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }

View File

@@ -29,6 +29,26 @@
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
├── cardAlarm.txt
│ @@ -833,18 +833,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardEntities.txt
│ @@ -61,14 +61,24 @@
│ vis tIcon4,0
@@ -547,6 +567,105 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -1886,18 +2268,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── cardGrid.txt
│ @@ -838,18 +838,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── cardMedia.txt
│ @@ -751,18 +751,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardQR.txt
│ @@ -702,18 +702,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── cardThermo.txt
│ @@ -1138,18 +1138,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── pageIcons.txt
│ @@ -15,15 +15,15 @@
│ Scope : global
@@ -749,7 +868,6 @@
│ - }
│ -
├── popupFan.txt
│┄ ordering differences only
│ @@ -78,31 +78,31 @@
│ Value: 1
@@ -854,6 +972,85 @@
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ @@ -623,18 +623,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupLight.txt
│ @@ -659,18 +659,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupNotify.txt
│ @@ -406,18 +406,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupShutter.txt
│ @@ -685,18 +685,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── screensaver.txt
│ @@ -71,15 +71,15 @@
│ Text tTime
@@ -872,3 +1069,22 @@
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -683,18 +683,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }

View File

@@ -1,4 +1,123 @@
+++ /dev/fd/62 2022-09-18 12:42:04.807862862 +0000
+++ /dev/fd/62 2022-09-18 15:58:47.706858635 +0000
+rdAlarm.txt
+18 +833,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+,18 +2268,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+rdGrid.txt
+18 +838,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+rdMedia.txt
+18 +751,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+rdQR.txt
+18 +702,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+rdThermo.txt
+,18 +1138,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+geIcons.txt
+5 +15,15 @@
+ Scope : global
@@ -165,6 +284,85 @@
+ }
+ }
+
+18 +623,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+pupLight.txt
+18 +659,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+pupNotify.txt
+18 +406,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+pupShutter.txt
+18 +685,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+reensaver.txt
+5 +71,15 @@
+ime
@@ -183,3 +381,22 @@
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+18 +683,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }

View File

@@ -1419,6 +1419,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -2843,6 +2843,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -1287,6 +1287,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -1186,6 +1186,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -1354,6 +1354,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -1005,6 +1005,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -1840,6 +1840,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -6,6 +6,10 @@ pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupNotify
17 Component(s)
230 Line(s) of event code
145 Unique line(s) of event code
pageTest
20 Component(s)
65 Line(s) of event code
@@ -14,57 +18,53 @@ pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
cardGrid
42 Component(s)
469 Line(s) of event code
278 Unique line(s) of event code
popupFan
27 Component(s)
342 Line(s) of event code
199 Unique line(s) of event code
popupShutter
25 Component(s)
389 Line(s) of event code
212 Unique line(s) of event code
cardMedia
34 Component(s)
389 Line(s) of event code
210 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
cardAlarm
40 Component(s)
422 Line(s) of event code
255 Unique line(s) of event code
cardQR
32 Component(s)
404 Line(s) of event code
235 Unique line(s) of event code
popupNotify
17 Component(s)
226 Line(s) of event code
143 Unique line(s) of event code
cardPower
48 Component(s)
387 Line(s) of event code
279 Unique line(s) of event code
cardThermo
52 Component(s)
580 Line(s) of event code
303 Unique line(s) of event code
popupLight
27 Component(s)
386 Line(s) of event code
211 Unique line(s) of event code
390 Line(s) of event code
213 Unique line(s) of event code
screensaver
38 Component(s)
345 Line(s) of event code
265 Unique line(s) of event code
cardPower
48 Component(s)
391 Line(s) of event code
281 Unique line(s) of event code
popupFan
27 Component(s)
346 Line(s) of event code
201 Unique line(s) of event code
cardGrid
42 Component(s)
473 Line(s) of event code
280 Unique line(s) of event code
cardMedia
34 Component(s)
393 Line(s) of event code
212 Unique line(s) of event code
popupShutter
25 Component(s)
393 Line(s) of event code
214 Unique line(s) of event code
cardQR
32 Component(s)
408 Line(s) of event code
237 Unique line(s) of event code
cardAlarm
40 Component(s)
426 Line(s) of event code
257 Unique line(s) of event code
cardThermo
52 Component(s)
584 Line(s) of event code
305 Unique line(s) of event code
cardEntities
65 Component(s)
1132 Line(s) of event code
519 Unique line(s) of event code
1136 Line(s) of event code
521 Unique line(s) of event code
Total
15 Page(s)
493 Component(s)
5712 Line(s) of event code
1556 Unique line(s) of event code
5760 Line(s) of event code
1558 Unique line(s) of event code

View File

@@ -918,6 +918,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -990,6 +990,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -600,6 +600,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -999,6 +999,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -1252,6 +1252,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -837,6 +837,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -1890,6 +1890,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -842,6 +842,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -755,6 +755,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -749,6 +749,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -706,6 +706,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -1142,6 +1142,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

View File

@@ -627,6 +627,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -663,6 +663,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -410,6 +410,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -689,6 +689,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1

View File

@@ -687,6 +687,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
// end of user code
udelete payloadLength-1