mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-15 09:26:58 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
a481e70976
commit
9e026d8922
@@ -15,25 +15,6 @@
|
||||
│ + // fix touch offset (Removed for US version)
|
||||
│ + //lcd_dev fffb 0002 0000 0020
|
||||
│ page pageStartup
|
||||
│ --- HMI/n2t-out/cardAlarm.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
│ @@ -34,15 +34,15 @@
|
||||
│ vis b9,0
|
||||
│ vis b10,0
|
||||
│ vis b11,0
|
||||
│ vis tCode,0
|
||||
│ vis bPrev,0
|
||||
│ vis bNext,0
|
||||
│ cardAlarm.bco=defaultBcoColor
|
||||
│ - for(sys0=0;sys0<44;sys0++)
|
||||
│ + for(sys0=0;sys0<40;sys0++)
|
||||
│ {
|
||||
│ if(b[sys0].type==98||b[sys0].type==116)
|
||||
│ {
|
||||
│ b[sys0].bco=defaultBcoColor
|
||||
│ //b[sys0].pco=defaultFontColor
|
||||
│ }
|
||||
│ }
|
||||
│ --- HMI/n2t-out/cardEntities.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
│ @@ -61,16 +61,36 @@
|
||||
@@ -1066,277 +1047,25 @@
|
||||
│ //command format pageType,specialPageName
|
||||
│ //write name of speical page to tId
|
||||
│ spstr strCommand.txt,tId.txt,"~",1
|
||||
│ --- HMI/n2t-out/cardPower.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
|
||||
│ @@ -35,15 +35,15 @@
|
||||
│ vis t0Icon,0
|
||||
│ vis t1Icon,0
|
||||
│ vis t2Icon,0
|
||||
│ vis t3Icon,0
|
||||
│ vis t4Icon,0
|
||||
│ vis t5Icon,0
|
||||
│ cardPower.bco=defaultBcoColor
|
||||
│ - for(sys0=0;sys0<48;sys0++)
|
||||
│ + for(sys0=0;sys0<43;sys0++)
|
||||
│ --- HMI/n2t-out/cardMedia.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
│ @@ -25,15 +25,15 @@
|
||||
│ 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++)
|
||||
│ + for(sys0=0;sys0<34;sys0++)
|
||||
│ {
|
||||
│ if(b[sys0].type==98||b[sys0].type==116)
|
||||
│ {
|
||||
│ b[sys0].bco=defaultBcoColor
|
||||
│ b[sys0].pco=defaultFontColor
|
||||
│ }
|
||||
│ if(defaultBcoColor==0)
|
||||
│ @@ -283,15 +283,15 @@
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ Text :
|
||||
│ - Max. Text Size : 10
|
||||
│ + Max. Text Size : 20
|
||||
│
|
||||
│ Text tHomeO
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -303,81 +303,81 @@
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ Text :
|
||||
│ - Max. Text Size : 10
|
||||
│ + Max. Text Size : 20
|
||||
│
|
||||
│ Picture p0
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│
|
||||
│ Slider h0
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ - Position : 600
|
||||
│ - Upper range limit : 1200
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ Lower range limit : 0
|
||||
│
|
||||
│ Slider h1
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ - Position : 600
|
||||
│ - Upper range limit : 1200
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ Lower range limit : 0
|
||||
│
|
||||
│ Slider h2
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ - Position : 600
|
||||
│ - Upper range limit : 1200
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ Lower range limit : 0
|
||||
│
|
||||
│ Slider h3
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ - Position : 600
|
||||
│ - Upper range limit : 1200
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ Lower range limit : 0
|
||||
│
|
||||
│ Slider h4
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ - Position : 600
|
||||
│ - Upper range limit : 1200
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ Lower range limit : 0
|
||||
│
|
||||
│ Slider h5
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ - Position : 600
|
||||
│ - Upper range limit : 1200
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ Lower range limit : 0
|
||||
│
|
||||
│ Button bNext
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ @@ -463,92 +463,74 @@
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Period (ms): 100
|
||||
│ Enabled : yes
|
||||
│
|
||||
│ Events
|
||||
│ Timer Event
|
||||
│ - if(t0Speed.val!=0)
|
||||
│ + sys0=h0.val+t0Speed.val
|
||||
│ + if(sys0>h0.maxval)
|
||||
│ {
|
||||
│ - sys0=h0.val+t0Speed.val
|
||||
│ - if(sys0>h0.maxval)
|
||||
│ - {
|
||||
│ - h0.val=h0.minval
|
||||
│ - }
|
||||
│ - if(sys0<h0.minval)
|
||||
│ - {
|
||||
│ - h0.val=h0.maxval
|
||||
│ - }
|
||||
│ - h0.val+=t0Speed.val
|
||||
│ + h0.val=h0.minval
|
||||
│ }
|
||||
│ - if(t1Speed.val!=0)
|
||||
│ + if(sys0<h0.minval)
|
||||
│ {
|
||||
│ - sys0=h1.val+t1Speed.val
|
||||
│ - if(sys0>h1.maxval)
|
||||
│ - {
|
||||
│ - h1.val=h1.minval
|
||||
│ - }
|
||||
│ - if(sys0<h1.minval)
|
||||
│ - {
|
||||
│ - h1.val=h1.maxval
|
||||
│ - }
|
||||
│ - h1.val+=t1Speed.val
|
||||
│ + h0.val=h0.maxval
|
||||
│ }
|
||||
│ - if(t2Speed.val!=0)
|
||||
│ + h0.val+=t0Speed.val
|
||||
│ + sys0=h1.val+t1Speed.val
|
||||
│ + if(sys0>h1.maxval)
|
||||
│ {
|
||||
│ - sys0=h2.val+t2Speed.val
|
||||
│ - if(sys0>h2.maxval)
|
||||
│ - {
|
||||
│ - h2.val=h2.minval
|
||||
│ - }
|
||||
│ - if(sys0<h2.minval)
|
||||
│ - {
|
||||
│ - h2.val=h2.maxval
|
||||
│ - }
|
||||
│ - h2.val+=t2Speed.val
|
||||
│ + h1.val=h1.minval
|
||||
│ }
|
||||
│ - if(t3Speed.val!=0)
|
||||
│ + if(sys0<h1.minval)
|
||||
│ {
|
||||
│ - sys0=h3.val+t3Speed.val
|
||||
│ - if(sys0>h3.maxval)
|
||||
│ - {
|
||||
│ - h3.val=h3.minval
|
||||
│ - }
|
||||
│ - if(sys0<h3.minval)
|
||||
│ - {
|
||||
│ - h3.val=h3.maxval
|
||||
│ - }
|
||||
│ - h3.val+=t3Speed.val
|
||||
│ + h1.val=h1.maxval
|
||||
│ }
|
||||
│ - if(t4Speed.val!=0)
|
||||
│ + h1.val+=t1Speed.val
|
||||
│ + sys0=h2.val+t2Speed.val
|
||||
│ + if(sys0>h2.maxval)
|
||||
│ {
|
||||
│ - sys0=h4.val+t4Speed.val
|
||||
│ - if(sys0>h4.maxval)
|
||||
│ - {
|
||||
│ - h4.val=h4.minval
|
||||
│ - }
|
||||
│ - if(sys0<h4.minval)
|
||||
│ - {
|
||||
│ - h4.val=h4.maxval
|
||||
│ - }
|
||||
│ - h4.val+=t4Speed.val
|
||||
│ + h2.val=h2.minval
|
||||
│ }
|
||||
│ - if(t5Speed.val!=0)
|
||||
│ + if(sys0<h2.minval)
|
||||
│ {
|
||||
│ - sys0=h5.val+t5Speed.val
|
||||
│ - if(sys0>h5.maxval)
|
||||
│ - {
|
||||
│ - h5.val=h5.minval
|
||||
│ - }
|
||||
│ - if(sys0<h5.minval)
|
||||
│ - {
|
||||
│ - h5.val=h5.maxval
|
||||
│ - }
|
||||
│ - h5.val+=t5Speed.val
|
||||
│ + h2.val=h2.maxval
|
||||
│ + }
|
||||
│ + h2.val+=t2Speed.val
|
||||
│ + sys0=h3.val+t3Speed.val
|
||||
│ + if(sys0>h3.maxval)
|
||||
│ + {
|
||||
│ + h3.val=h3.minval
|
||||
│ + }
|
||||
│ + if(sys0<h3.minval)
|
||||
│ + {
|
||||
│ + h3.val=h3.maxval
|
||||
│ + }
|
||||
│ + h3.val+=t3Speed.val
|
||||
│ + sys0=h4.val+t4Speed.val
|
||||
│ + if(sys0>h4.maxval)
|
||||
│ + {
|
||||
│ + h4.val=h4.minval
|
||||
│ + }
|
||||
│ + if(sys0<h4.minval)
|
||||
│ + {
|
||||
│ + h4.val=h4.maxval
|
||||
│ + }
|
||||
│ + h4.val+=t4Speed.val
|
||||
│ + sys0=h5.val+t5Speed.val
|
||||
│ + if(sys0>h5.maxval)
|
||||
│ + {
|
||||
│ + h5.val=h5.minval
|
||||
│ + }
|
||||
│ + if(sys0<h5.minval)
|
||||
│ + {
|
||||
│ + h5.val=h5.maxval
|
||||
│ }
|
||||
│ + h5.val+=t5Speed.val
|
||||
│
|
||||
│ Timer tmSerial
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Period (ms): 50
|
||||
│ Enabled : yes
|
||||
│ --- HMI/n2t-out/cardQR.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
|
||||
│ @@ -602,19 +602,19 @@
|
||||
@@ -1363,7 +1092,60 @@
|
||||
│ }
|
||||
│ --- HMI/n2t-out/pageStartup.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
│ @@ -35,20 +35,14 @@
|
||||
│ @@ -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
|
||||
│
|
||||
│ Variable (string) strCommand
|
||||
│ Attributes
|
||||
@@ -1384,7 +1166,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -124,15 +118,15 @@
|
||||
│ @@ -124,15 +133,15 @@
|
||||
│ Text tMsg3
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -1401,24 +1183,7 @@
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ @@ -145,15 +139,15 @@
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ Text :
|
||||
│ - Max. Text Size : 30
|
||||
│ + Max. Text Size : 10
|
||||
│
|
||||
│ Text tVersion
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ @@ -179,15 +173,15 @@
|
||||
│ @@ -179,15 +188,15 @@
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
│ Events
|
||||
@@ -1437,7 +1202,7 @@
|
||||
│ //send cmd
|
||||
│ --- HMI/n2t-out/screensaver.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
|
||||
│ @@ -29,28 +29,19 @@
|
||||
│ @@ -29,22 +29,19 @@
|
||||
│ }
|
||||
│ tDate.txt=pageIcons.vaDate.txt
|
||||
│ dim=dimValue
|
||||
@@ -1453,21 +1218,15 @@
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ - Max. Text Size: 400
|
||||
│ -
|
||||
│ -Variable (string) strTmp
|
||||
│ - Attributes
|
||||
│ - Scope : local
|
||||
│ - Text :
|
||||
│ - Max. Text Size: 2
|
||||
│ + Max. Text Size: 200
|
||||
│
|
||||
│ Variable (string) tId
|
||||
│ Variable (string) strTmp
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ Max. Text Size: 25
|
||||
│ Max. Text Size: 2
|
||||
│
|
||||
│ @@ -103,35 +94,14 @@
|
||||
│ @@ -103,35 +100,14 @@
|
||||
│ Value: 0
|
||||
│
|
||||
│ Variable (int32) ycR
|
||||
@@ -1503,38 +1262,3 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -494,15 +464,14 @@
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
│ covx tTmp.txt,defaultFontColor,0,0
|
||||
│ }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="time")
|
||||
│ {
|
||||
│ - 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
|
||||
│ @@ -788,14 +757,18 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
│ if(tId.txt=="cardChart")
|
||||
│ {
|
||||
│ page cardChart
|
||||
│ }
|
||||
│ + if(tId.txt=="cardLChart")
|
||||
│ + {
|
||||
│ + page cardLChart
|
||||
│ + }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="timeout")
|
||||
│ {
|
||||
│ //set timeout to global var
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ covx tTmp.txt,sleepTimeout,0,0
|
||||
│ }
|
||||
|
||||
Reference in New Issue
Block a user