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

This commit is contained in:
joBr99
2023-01-23 19:17:10 +00:00
committed by github-actions[bot]
parent 71a54de2e0
commit 5b282b86f7
9 changed files with 90 additions and 194 deletions

View File

@@ -1094,60 +1094,7 @@
│ }
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -8,47 +8,56 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID : disabled
│ Events
│ Preinitialize Event
│ + dim=dimValueNormal
│ vis p0,0
│ - recmod=1
│ - bauds=115200
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ - vis bSendStartup,0
│ - vis frame_ptr,0
│ - vis spinner_w,0
│ - vis frapic_w,0
│ - vis usual_cnt,0
│ - vis tMsg2,0
│ - vis tMsg3,0
│ - vis tVersion,0
│ - dim=100
│ + vis t5,0
│ + vis tShuffle,0
│ + vis bPrev,0
│ + vis bNext,0
│ + vis bEntity1,0
│ + vis bEntity2,0
│ + vis bEntity3,0
│ + vis bEntity4,0
│ + vis bEntity5,0
│ + vis bEntity6,0
│ + cardMedia.bco=defaultBcoColor
│ + for(sys0=0;sys0<52;sys0++)
│ + {
│ + if(b[sys0].type==98||b[sys0].type==116)
│ + {
│ + b[sys0].bco=defaultBcoColor
│ + b[sys0].pco=defaultFontColor
│ + }
│ + }
│ + if(defaultBcoColor==0)
│ + {
│ + hVolume.pic=14
│ + hVolume.pic1=13
│ + hVolume.pic2=15
│ + }
│ Postinitialize Event
│ //send messages by clicking button
│ click bSendStartup,1
│ @@ -35,20 +35,14 @@
│ Variable (string) strCommand
│ Attributes
@@ -1168,7 +1115,7 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -124,15 +133,15 @@
│ @@ -124,15 +118,15 @@
│ Text tMsg3
│ Attributes
│ Scope : local
@@ -1185,7 +1132,7 @@
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -179,15 +188,15 @@
│ @@ -179,15 +173,15 @@
│ Max. Text Size : 10
│ Events
@@ -1264,3 +1211,20 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -494,15 +470,15 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ - click m0,1
│ + //click m0,1
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0