sync (add nextion2text)

This commit is contained in:
joBr99
2022-11-03 17:05:42 +00:00
committed by github-actions[bot]
parent 7e8ffca023
commit 51d74fceb2
13 changed files with 115 additions and 148 deletions

View File

@@ -13,31 +13,7 @@
│ - lcd_dev fffb 0002 0000 0020 │ - lcd_dev fffb 0002 0000 0020
│ - page pageStartup │ - page pageStartup
├── arm1.txt ├── arm1.txt
│ @@ -478,22 +478,15 @@ │ @@ -671,19 +671,14 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,cardAlarm,"
│ - if(bPrev.txt=="")
│ - {
│ - tSend.txt+="bHome"
│ - }else
│ - {
│ - tSend.txt+="bNext"
│ - }
│ + tSend.txt="event,buttonPress2,cardAlarm,bNext"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -671,19 +664,14 @@
│ } │ }
│ if(tTmp.txt=="1") │ if(tTmp.txt=="1")
│ { │ {
@@ -58,31 +34,7 @@
│ } │ }
│ //id arm1 │ //id arm1
├── bDown1.txt ├── bDown1.txt
│ @@ -529,22 +529,15 @@ │ @@ -1253,19 +1253,14 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,cardEntities,"
│ - if(bPrev.txt=="")
│ - {
│ - tSend.txt+="bHome"
│ - }else
│ - {
│ - tSend.txt+="bNext"
│ - }
│ + tSend.txt="event,buttonPress2,cardEntities,bNext"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -1253,19 +1246,14 @@
│ } │ }
│ if(tTmp.txt=="1") │ if(tTmp.txt=="1")
│ { │ {
@@ -103,31 +55,7 @@
│ { │ {
│ vis bUp1,0 │ vis bUp1,0
├── bDown2.txt ├── bDown2.txt
│ @@ -290,22 +290,15 @@ │ @@ -925,19 +925,14 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,cardThermo,"
│ - if(bPrev.txt=="")
│ - {
│ - tSend.txt+="bHome"
│ - }else
│ - {
│ - tSend.txt+="bNext"
│ - }
│ + tSend.txt="event,buttonPress2,cardThermo,bNext"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -925,19 +918,14 @@
│ } │ }
│ if(tTmp.txt=="1") │ if(tTmp.txt=="1")
│ { │ {
@@ -148,31 +76,7 @@
│ spstr strCommand.txt,tTmp.txt,"~",5 │ spstr strCommand.txt,tTmp.txt,"~",5
│ covx tTmp.txt,xTempDest1.val,0,0 │ covx tTmp.txt,xTempDest1.val,0,0
├── bEntity1.txt ├── bEntity1.txt
│ @@ -467,22 +467,15 @@ │ @@ -680,19 +680,14 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,cardGrid,"
│ - if(bPrev.txt=="")
│ - {
│ - tSend.txt+="bHome"
│ - }else
│ - {
│ - tSend.txt+="bNext"
│ - }
│ + tSend.txt="event,buttonPress2,cardGrid,bNext"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -680,19 +673,14 @@
│ } │ }
│ if(tTmp.txt=="1") │ if(tTmp.txt=="1")
│ { │ {
@@ -203,7 +107,7 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Locked : no │ Locked : no
│ Swide up page ID : disabled │ Swide up page ID : disabled
│ @@ -14,451 +14,343 @@ │ @@ -14,444 +14,343 @@
│ Preinitialize Event │ Preinitialize Event
│ dim=dimValueNormal │ dim=dimValueNormal
│ vis p0,0 │ vis p0,0
@@ -794,22 +698,15 @@
│ Events │ Events
│ Touch Press Event │ Touch Press Event
│ - tSend.txt="event,buttonPress2,cardMedia," │ - tSend.txt="event,buttonPress2,cardMedia,"
- if(bPrev.txt=="") + tSend.txt="event,buttonPress2,cardPower,"
- { if(bPrev.txt=="")
- tSend.txt+="bHome" {
- }else tSend.txt+="bHome"
- { }else
- tSend.txt+="bNext" {
- } tSend.txt+="bNext"
+ tSend.txt="event,buttonPress2,cardAlarm,bNext" }
//send calc crc @@ -475,15 +374,15 @@
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -475,15 +367,15 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ State : unpressed │ State : unpressed
│ Text :  │ Text : 
@@ -826,7 +723,7 @@
│ { │ {
│ tSend.txt+="bPrev" │ tSend.txt+="bPrev"
│ } │ }
│ @@ -528,23 +420,82 @@ │ @@ -528,23 +427,82 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
@@ -912,7 +809,7 @@
│ Period (ms): 50 │ Period (ms): 50
│ Enabled : yes │ Enabled : yes
│ @@ -591,15 +542,15 @@ │ @@ -591,15 +549,15 @@
│ // here is the location where acual code should be │ // here is the location where acual code should be
│ // write command to variable strCommand │ // write command to variable strCommand
│ ucopy strCommand.txt,4,payloadLength-5,0 │ ucopy strCommand.txt,4,payloadLength-5,0
@@ -929,7 +826,7 @@
│ if(tTmp.txt=="0") │ if(tTmp.txt=="0")
│ { │ {
│ vis bPrev,0 │ vis bPrev,0
│ @@ -628,100 +579,148 @@ │ @@ -628,100 +586,148 @@
│ } │ }
│ if(tTmp.txt=="1") │ if(tTmp.txt=="1")
│ { │ {
@@ -1154,7 +1051,7 @@
│ //write name of speical page to tId │ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1 │ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one │ //save second arg if there's one
│ @@ -779,33 +778,62 @@ │ @@ -779,33 +785,62 @@
│ page cardQR │ page cardQR
│ } │ }
│ if(tId.txt=="cardPower") │ if(tId.txt=="cardPower")
@@ -1226,7 +1123,7 @@
│ Scope : local │ Scope : local
│ Period (ms): 1000 │ Period (ms): 1000
│ Enabled : yes │ Enabled : yes
│ @@ -815,15 +843,15 @@ │ @@ -815,15 +850,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim) │ if(sleepTimeout!=0&&dimValue!=dim)
│ { │ {
│ sleepValue+=1 │ sleepValue+=1

View File

@@ -1014,7 +1014,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,bNext" tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -1055,7 +1055,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardEntities,bNext" tSend.txt="event,buttonPress2,cardEntities,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -634,7 +634,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardThermo,bNext" tSend.txt="event,buttonPress2,cardThermo,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -857,7 +857,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardGrid,bNext" tSend.txt="event,buttonPress2,cardGrid,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -801,7 +801,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,bNext" tSend.txt="event,buttonPress2,cardPower,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -14,29 +14,29 @@ b0
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
bNext
43 Component(s)
423 Line(s) of event code
293 Unique line(s) of event code
bEntity1
42 Component(s)
478 Line(s) of event code
283 Unique line(s) of event code
arm1 arm1
40 Component(s) 40 Component(s)
427 Line(s) of event code 434 Line(s) of event code
258 Unique line(s) of event code 260 Unique line(s) of event code
bNext
43 Component(s)
430 Line(s) of event code
296 Unique line(s) of event code
bEntity1
42 Component(s)
485 Line(s) of event code
285 Unique line(s) of event code
bDown2 bDown2
53 Component(s) 53 Component(s)
596 Line(s) of event code 603 Line(s) of event code
313 Unique line(s) of event code 315 Unique line(s) of event code
bDown1 bDown1
65 Component(s) 65 Component(s)
1153 Line(s) of event code 1160 Line(s) of event code
527 Unique line(s) of event code 529 Unique line(s) of event code
Total Total
17 Page(s) 17 Page(s)
351 Component(s) 351 Component(s)
4164 Line(s) of event code 4199 Line(s) of event code
1374 Unique line(s) of event code 1374 Unique line(s) of event code

View File

@@ -482,7 +482,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,bNext" tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -533,7 +533,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardEntities,bNext" tSend.txt="event,buttonPress2,cardEntities,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -294,7 +294,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardThermo,bNext" tSend.txt="event,buttonPress2,cardThermo,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -471,7 +471,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardGrid,bNext" tSend.txt="event,buttonPress2,cardGrid,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -346,7 +346,14 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,bNext" tSend.txt="event,buttonPress2,cardPower,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-11-03 16:54:51.903301723 +0000 +++ /dev/fd/62 2022-11-03 17:05:36.052771693 +0000
+m1.txt +m1.txt
+22 +478,15 @@ +22 +478,15 @@
+ Send Component ID : disabled + Send Component ID : disabled