add title on cardAlarm (add nextion2text)

This commit is contained in:
joBr99
2023-01-12 21:12:44 +00:00
committed by github-actions[bot]
parent da6700bff8
commit 8f9da7ed72
6 changed files with 1141 additions and 42 deletions

View File

@@ -30,7 +30,338 @@
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -864,18 +864,14 @@
│ @@ -123,24 +123,14 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ Max. Text Size : 10
│ -Text tHeading
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 40
│ -
│ Text tIcon
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -313,176 +303,154 @@
│ State : unpressed
│ Text : 1
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"1"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 2
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"2"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b10
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 0
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"0"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b11
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : CLR
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=""
│ - vis tCode,1
│ - vis tHeading,0
│ Button b2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 3
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"3"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b3
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 4
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"4"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b4
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 5
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"5"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b5
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 6
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"6"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b6
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 7
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"7"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b7
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 8
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"8"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b8
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ Text : 9
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ tCode.txt=tCode.txt+"9"
│ - vis tCode,1
│ - vis tHeading,0
│ Button b9
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -665,24 +633,15 @@
│ // write command to variable strCommand
│ ucopy strCommand.txt,4,payloadLength-5,0
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
│ spstr strCommand.txt,tInstruction.txt,"~",0
│ if(tInstruction.txt=="entityUpd")
│ {
│ //entn
│ - spstr strCommand.txt,tHeading.txt,"~",1
│ - if(tHeading.txt!="")
│ - {
│ - vis tCode,0
│ - vis tHeading,1
│ - }else
│ - {
│ - vis tCode,1
│ - vis tHeading,0
│ - }
│ + spstr strCommand.txt,entn.txt,"~",1
│ // navigation icon left
│ spstr strCommand.txt,tTmp.txt,"~",2 //type
│ if(tTmp.txt=="delete"||tTmp.txt=="")
│ {
│ vis bPrev,0
│ }else
│ {
│ @@ -709,56 +668,54 @@
│ spstr strCommand.txt,bNext.txt,"~",10
│ // change icon color
│ spstr strCommand.txt,tTmp.txt,"~",11
│ covx tTmp.txt,sys0,0,0
│ bNext.pco=sys0
│ vis bNext,1
│ }
│ - //entn
│ - spstr strCommand.txt,entn.txt,"~",14
│ //text arm1
│ - spstr strCommand.txt,arm1.txt,"~",15
│ + spstr strCommand.txt,arm1.txt,"~",14
│ if(arm1.txt!="")
│ {
│ vis arm1,1
│ }
│ //id arm1
│ - spstr strCommand.txt,va1.txt,"~",16
│ + spstr strCommand.txt,va1.txt,"~",15
│ //text arm2
│ - spstr strCommand.txt,arm2.txt,"~",17
│ + spstr strCommand.txt,arm2.txt,"~",16
│ if(arm2.txt!="")
│ {
│ vis arm2,1
│ }
│ //id arm2
│ - spstr strCommand.txt,va2.txt,"~",18
│ + spstr strCommand.txt,va2.txt,"~",17
│ //text arm3
│ - spstr strCommand.txt,arm3.txt,"~",19
│ + spstr strCommand.txt,arm3.txt,"~",18
│ if(arm3.txt!="")
│ {
│ vis arm3,1
│ }
│ //id arm3
│ - spstr strCommand.txt,va3.txt,"~",20
│ + spstr strCommand.txt,va3.txt,"~",19
│ //text arm4
│ - spstr strCommand.txt,arm4.txt,"~",21
│ + spstr strCommand.txt,arm4.txt,"~",20
│ if(arm4.txt!="")
│ {
│ vis arm4,1
│ }
│ //id arm4
│ - spstr strCommand.txt,va4.txt,"~",22
│ + spstr strCommand.txt,va4.txt,"~",21
│ //icon
│ - spstr strCommand.txt,tIcon.txt,"~",23
│ + spstr strCommand.txt,tIcon.txt,"~",22
│ //icon color
│ - spstr strCommand.txt,tTmp.txt,"~",24
│ + spstr strCommand.txt,tTmp.txt,"~",23
│ covx tTmp.txt,sys0,0,0
│ tIcon.pco=sys0
│ //numpad status
│ - spstr strCommand.txt,tTmp.txt,"~",25
│ + spstr strCommand.txt,tTmp.txt,"~",24
│ if(tTmp.txt!="disable")
│ {
│ vis b0,1
│ vis b1,1
│ vis b2,1
│ vis b3,1
│ vis b4,1
│ @@ -783,30 +740,30 @@
│ vis b8,0
│ vis b9,0
│ vis b10,0
│ vis b11,0
│ vis tCode,0
│ }
│ //flashing status
│ - spstr strCommand.txt,tTmp.txt,"~",26
│ + spstr strCommand.txt,tTmp.txt,"~",25
│ if(tTmp.txt=="enable")
│ {
│ tmFlash.en=1
│ }else
│ {
│ tmFlash.en=0
│ }
│ // extra button
│ - spstr strCommand.txt,b9.txt,"~",27
│ + spstr strCommand.txt,b9.txt,"~",26
│ if(b9.txt!="")
│ {
│ vis b9,1
│ - spstr strCommand.txt,tTmp.txt,"~",28
│ + spstr strCommand.txt,tTmp.txt,"~",27
│ covx tTmp.txt,b9.pco,0,0
│ - spstr strCommand.txt,vaAddBtn.txt,"~",29
│ + spstr strCommand.txt,vaAddBtn.txt,"~",28
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -907,18 +864,14 @@
│ {
│ page cardPower
│ }