Synced US-P (#178)

* synced us-p version

* synced us-p version (add nextion2text)

Co-authored-by: jmbinette <jmbinette@users.noreply.github.com>
This commit is contained in:
jmbinette
2022-05-06 10:59:42 -04:00
committed by GitHub
parent 71de35f32d
commit 10ca0c2ca3
26 changed files with 339 additions and 686 deletions

View File

@@ -33,6 +33,8 @@ Page cardAlarm
vis b9,0
vis b10,0
vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -735,7 +737,7 @@ Timer tmSleep
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -72,6 +72,8 @@ Page cardEntities
vis bText5,0
vis hSlider5,0
vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes

View File

@@ -34,6 +34,8 @@ Page cardGrid
vis tEntity4,0
vis tEntity5,0
vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -838,7 +840,7 @@ Timer tmSleep
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -18,7 +18,8 @@ Page cardMedia
vis tTmp,0
vis tId,0
vis t5,0
//vis nPageDisp,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -697,7 +698,7 @@ Timer tmSleep
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -31,6 +31,8 @@ Page cardThermo
vis bt6,0
vis bt7,0
vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -948,7 +950,7 @@ Timer tmSleep
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -182,7 +182,7 @@ Button bSendStartup
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupLight
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -120,7 +120,7 @@ Button b0
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -147,7 +147,7 @@ Button b2
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -174,7 +174,7 @@ Button b1
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupShutter
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -172,7 +172,7 @@ Button b0
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -197,7 +197,7 @@ Button bDown1
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -222,7 +222,7 @@ Button bStop1
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -247,7 +247,7 @@ Button bUp1
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -17,6 +17,8 @@ Page screensaver
vis tInstruction,0
vis tTmp,0
vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -290,6 +292,26 @@ Text tMR
Text :
Max. Text Size : 10
Text tNotifyHead
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Text tNotifyText
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Picture p0
Attributes
Scope : local
@@ -521,6 +543,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType")
{
dim=100
@@ -610,6 +646,16 @@ TouchCap tc0
Events
Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
@@ -618,7 +664,7 @@ TouchCap tc0
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb