sync (add nextion2text)

This commit is contained in:
joBr99
2022-10-08 22:37:27 +00:00
committed by github-actions[bot]
parent a02e25d551
commit f87a2e8b2c
7 changed files with 36 additions and 156 deletions

View File

@@ -48,146 +48,6 @@
│ } │ }
│ } │ }
│ } │ }
├── cardEntities.txt
│ @@ -782,15 +782,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text :
│ - Max. Text Size : 45
│ + Max. Text Size : 40
│ Events
│ Touch Press Event
│ tSend.txt="event,buttonPress2,"+entn1.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -807,15 +807,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text :
│ - Max. Text Size : 45
│ + Max. Text Size : 40
│ Events
│ Touch Press Event
│ tSend.txt="event,buttonPress2,"+entn2.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -832,15 +832,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text :
│ - Max. Text Size : 45
│ + Max. Text Size : 40
│ Events
│ Touch Press Event
│ tSend.txt="event,buttonPress2,"+entn3.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -857,15 +857,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text :
│ - Max. Text Size : 45
│ + Max. Text Size : 40
│ Events
│ Touch Press Event
│ tSend.txt="event,buttonPress2,"+entn4.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -1837,15 +1837,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
│ udelete payloadLength-1
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -1887,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
│ @@ -789,15 +789,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
│ udelete payloadLength-1
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -839,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")
├── pageStartup.txt ├── pageStartup.txt
│ @@ -173,15 +173,15 @@ │ @@ -173,15 +173,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10

View File

@@ -1525,7 +1525,7 @@ Button bText1
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1572,7 +1572,7 @@ Button bText2
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1619,7 +1619,7 @@ Button bText3
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1666,7 +1666,7 @@ Button bText4
Vertical Alignment : center Vertical Alignment : center
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -2794,6 +2794,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -2843,6 +2844,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -1238,6 +1238,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -1287,6 +1288,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -36,8 +36,8 @@ pageTest
14 Unique line(s) of event code 14 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
469 Line(s) of event code 474 Line(s) of event code
278 Unique line(s) of event code 281 Unique line(s) of event code
cardPower cardPower
43 Component(s) 43 Component(s)
420 Line(s) of event code 420 Line(s) of event code
@@ -54,17 +54,17 @@ screensaver
38 Component(s) 38 Component(s)
338 Line(s) of event code 338 Line(s) of event code
262 Unique line(s) of event code 262 Unique line(s) of event code
cardEntities
65 Component(s)
1132 Line(s) of event code
519 Unique line(s) of event code
cardThermo cardThermo
52 Component(s) 52 Component(s)
585 Line(s) of event code 585 Line(s) of event code
306 Unique line(s) of event code 306 Unique line(s) of event code
cardEntities
65 Component(s)
1137 Line(s) of event code
522 Unique line(s) of event code
Total Total
15 Page(s) 15 Page(s)
482 Component(s) 482 Component(s)
5724 Line(s) of event code 5734 Line(s) of event code
1546 Unique line(s) of event code 1546 Unique line(s) of event code

View File

@@ -786,7 +786,7 @@ Button bText1
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -811,7 +811,7 @@ Button bText2
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -836,7 +836,7 @@ Button bText3
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -861,7 +861,7 @@ Button bText4
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : Text :
Max. Text Size : 40 Max. Text Size : 45
Events Events
Touch Press Event Touch Press Event
@@ -1841,6 +1841,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -1890,6 +1891,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -793,6 +793,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -842,6 +843,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-08 22:15:32.998264146 +0000 +++ /dev/fd/62 2022-10-08 22:37:22.226531609 +0000
+rdAlarm.txt +rdAlarm.txt
+15 +784,14 @@ +15 +784,14 @@
+ //command format pageType,specialPageName + //command format pageType,specialPageName