mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-19 12:44:44 +01:00
sync serial proto changes to us-p (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
aab0f46b58
commit
d0436c0b55
@@ -1080,7 +1080,7 @@
|
||||
│
|
||||
│ Variable (string) nent1
|
||||
│ Attributes
|
||||
│ @@ -69,15 +69,15 @@
|
||||
│ @@ -69,46 +69,82 @@
|
||||
│ Text :
|
||||
│ Max. Text Size: 80
|
||||
│
|
||||
@@ -1096,8 +1096,75 @@
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t0o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t1Speed
|
||||
│ @@ -135,24 +135,14 @@
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t1o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t2Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t2o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t3Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t3o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t4Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t4o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (int32) t5Speed
|
||||
│ Attributes
|
||||
│ Scope: local
|
||||
│ Value: 0
|
||||
│
|
||||
│ +Variable (string) t5o
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Text :
|
||||
│ + Max. Text Size: 1
|
||||
│ +
|
||||
│ Variable (string) tId
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ Max. Text Size: 20
|
||||
│
|
||||
│ Variable (string) tInstruction
|
||||
│ @@ -135,24 +171,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1122,7 +1189,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -175,24 +165,14 @@
|
||||
│ @@ -175,24 +201,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1147,7 +1214,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -205,24 +185,14 @@
|
||||
│ @@ -205,24 +221,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1172,7 +1239,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -235,24 +205,14 @@
|
||||
│ @@ -235,24 +241,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1197,7 +1264,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -265,24 +225,14 @@
|
||||
│ @@ -265,24 +261,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1222,7 +1289,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -295,24 +245,14 @@
|
||||
│ @@ -295,24 +281,14 @@
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -1247,7 +1314,7 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -535,85 +475,79 @@
|
||||
│ @@ -535,85 +511,79 @@
|
||||
│ h0.val=h0.minval
|
||||
│ }
|
||||
│ if(sys0<h0.minval)
|
||||
@@ -1333,275 +1400,6 @@
|
||||
│ Scope : local
|
||||
│ Period (ms): 50
|
||||
│ Enabled : yes
|
||||
│ @@ -661,14 +595,15 @@
|
||||
│ // here is the location where acual code should be
|
||||
│ // 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")
|
||||
│ {
|
||||
│ + // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
|
||||
│ spstr strCommand.txt,tHeading.txt,"~",1
|
||||
│ // navigation icon left
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
│ if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
│ {
|
||||
│ vis bPrev,0
|
||||
│ }else
|
||||
│ @@ -697,202 +632,193 @@
|
||||
│ // change icon color
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",11
|
||||
│ covx tTmp.txt,sys0,0,0
|
||||
│ bNext.pco=sys0
|
||||
│ vis bNext,1
|
||||
│ }
|
||||
│ // icon color home
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",17
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",14
|
||||
│ covx tTmp.txt,t1.pco,0,0
|
||||
│ // icon home
|
||||
│ - spstr strCommand.txt,t1.txt,"~",16
|
||||
│ + spstr strCommand.txt,t1.txt,"~",15
|
||||
│ // speed 16 ignored
|
||||
│ // text home
|
||||
│ - spstr strCommand.txt,tHome.txt,"~",19
|
||||
│ + spstr strCommand.txt,tHome.txt,"~",17
|
||||
│ spstr tHome.txt,tHome2.txt," ",1
|
||||
│ spstr tHome.txt,tHome.txt," ",0
|
||||
│ + // icon color 18 ignored
|
||||
│ + // icon 19 ignored
|
||||
│ + // speed 20 ignored
|
||||
│ // text home
|
||||
│ - spstr strCommand.txt,tHomeO.txt,"~",26
|
||||
│ + spstr strCommand.txt,tHomeO.txt,"~",21
|
||||
│ spstr tHomeO.txt,tHomeO2.txt," ",1
|
||||
│ spstr tHomeO.txt,tHomeO.txt," ",0
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",31
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ covx tTmp.txt,t0Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t0Icon.txt,"~",30
|
||||
│ + spstr strCommand.txt,t0Icon.txt,"~",23
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",34
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",24
|
||||
│ covx tTmp.txt,t0Speed.val,0,0
|
||||
│ if(t0Speed.val>120)
|
||||
│ {
|
||||
│ t0Speed.val=120
|
||||
│ }
|
||||
│ if(t0Speed.val<-120)
|
||||
│ {
|
||||
│ t0Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t0u.txt,"~",33
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t0o.txt,"~",32
|
||||
│ + spstr strCommand.txt,t0u.txt,"~",25
|
||||
│ if(t0Icon.txt!="")
|
||||
│ {
|
||||
│ vis t0Icon,1
|
||||
│ vis t0u,1
|
||||
│ vis h0,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t0Icon,0
|
||||
│ vis t0u,0
|
||||
│ vis h0,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",38
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",26
|
||||
│ covx tTmp.txt,t1Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t1Icon.txt,"~",37
|
||||
│ + spstr strCommand.txt,t1Icon.txt,"~",27
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",41
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",28
|
||||
│ covx tTmp.txt,t1Speed.val,0,0
|
||||
│ if(t1Speed.val>120)
|
||||
│ {
|
||||
│ t1Speed.val=120
|
||||
│ }
|
||||
│ if(t1Speed.val<-120)
|
||||
│ {
|
||||
│ t1Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t1u.txt,"~",40
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t1o.txt,"~",39
|
||||
│ + spstr strCommand.txt,t1u.txt,"~",29
|
||||
│ if(t1Icon.txt!="")
|
||||
│ {
|
||||
│ vis t1Icon,1
|
||||
│ vis t1u,1
|
||||
│ vis h1,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t1Icon,0
|
||||
│ vis t1u,0
|
||||
│ vis h1,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",45
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",30
|
||||
│ covx tTmp.txt,t2Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t2Icon.txt,"~",44
|
||||
│ + spstr strCommand.txt,t2Icon.txt,"~",31
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",48
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",32
|
||||
│ covx tTmp.txt,t2Speed.val,0,0
|
||||
│ if(t2Speed.val>120)
|
||||
│ {
|
||||
│ t2Speed.val=120
|
||||
│ }
|
||||
│ if(t2Speed.val<-120)
|
||||
│ {
|
||||
│ t2Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t2u.txt,"~",47
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t2o.txt,"~",46
|
||||
│ + spstr strCommand.txt,t2u.txt,"~",33
|
||||
│ if(t2Icon.txt!="")
|
||||
│ {
|
||||
│ vis t2Icon,1
|
||||
│ vis t2u,1
|
||||
│ vis h2,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t2Icon,0
|
||||
│ vis t2u,0
|
||||
│ vis h2,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",52
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",34
|
||||
│ covx tTmp.txt,t3Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t3Icon.txt,"~",51
|
||||
│ + spstr strCommand.txt,t3Icon.txt,"~",35
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",55
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",36
|
||||
│ covx tTmp.txt,t3Speed.val,0,0
|
||||
│ if(t3Speed.val>120)
|
||||
│ {
|
||||
│ t3Speed.val=120
|
||||
│ }
|
||||
│ if(t3Speed.val<-120)
|
||||
│ {
|
||||
│ t3Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t3u.txt,"~",54
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t3o.txt,"~",53
|
||||
│ + spstr strCommand.txt,t3u.txt,"~",37
|
||||
│ if(t3Icon.txt!="")
|
||||
│ {
|
||||
│ vis t3Icon,1
|
||||
│ vis t3u,1
|
||||
│ vis h3,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t3Icon,0
|
||||
│ vis t3u,0
|
||||
│ vis h3,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",59
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",38
|
||||
│ covx tTmp.txt,t4Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t4Icon.txt,"~",58
|
||||
│ + spstr strCommand.txt,t4Icon.txt,"~",39
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",62
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",40
|
||||
│ covx tTmp.txt,t4Speed.val,0,0
|
||||
│ if(t4Speed.val>120)
|
||||
│ {
|
||||
│ t4Speed.val=120
|
||||
│ }
|
||||
│ if(t4Speed.val<-120)
|
||||
│ {
|
||||
│ t4Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t4u.txt,"~",61
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t4o.txt,"~",60
|
||||
│ + spstr strCommand.txt,t4u.txt,"~",41
|
||||
│ if(t4Icon.txt!="")
|
||||
│ {
|
||||
│ vis t4Icon,1
|
||||
│ vis t4u,1
|
||||
│ vis h4,1
|
||||
│ }else
|
||||
│ {
|
||||
│ vis t4Icon,0
|
||||
│ vis t4u,0
|
||||
│ vis h4,0
|
||||
│ }
|
||||
│ // iconColor
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",66
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",42
|
||||
│ covx tTmp.txt,t5Icon.pco,0,0
|
||||
│ // icon
|
||||
│ - spstr strCommand.txt,t5Icon.txt,"~",65
|
||||
│ + spstr strCommand.txt,t5Icon.txt,"~",43
|
||||
│ // speed
|
||||
│ - spstr strCommand.txt,tTmp.txt,"~",69
|
||||
│ + spstr strCommand.txt,tTmp.txt,"~",44
|
||||
│ covx tTmp.txt,t5Speed.val,0,0
|
||||
│ if(t5Speed.val>120)
|
||||
│ {
|
||||
│ t5Speed.val=120
|
||||
│ }
|
||||
│ if(t5Speed.val<-120)
|
||||
│ {
|
||||
│ t5Speed.val=-120
|
||||
│ }
|
||||
│ // lower text
|
||||
│ - spstr strCommand.txt,t5u.txt,"~",68
|
||||
│ - // upper text
|
||||
│ - spstr strCommand.txt,t5o.txt,"~",67
|
||||
│ + spstr strCommand.txt,t5u.txt,"~",45
|
||||
│ if(t5Icon.txt!="")
|
||||
│ {
|
||||
│ vis t5Icon,1
|
||||
│ vis t5u,1
|
||||
│ vis h5,1
|
||||
│ }else
|
||||
│ {
|
||||
│ @@ -965,14 +891,18 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
│ if(tId.txt=="cardChart")
|
||||
│ {
|
||||
│ page cardChart
|
||||
│ }
|
||||
│ + if(tId.txt=="cardLChart")
|
||||
│ + {
|
||||
│ + page cardLChart
|
||||
│ + }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="time")
|
||||
│ {
|
||||
│ // get set time to global variable
|
||||
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
||||
│ }
|
||||
│ if(tInstruction.txt=="date")
|
||||
│ --- HMI/n2t-out/pageStartup.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
│ @@ -35,20 +35,14 @@
|
||||
|
||||
Reference in New Issue
Block a user