mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-19 22:24:15 +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
27b4a2205c
commit
e88ec15d60
@@ -88,6 +88,25 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -748,18 +724,14 @@
|
||||
│ {
|
||||
│ page pageStartup
|
||||
│ }
|
||||
│ if(tId.txt=="screensaver")
|
||||
│ {
|
||||
│ page screensaver
|
||||
│ }
|
||||
│ - if(tId.txt=="screensaver2")
|
||||
│ - {
|
||||
│ - page screensaver
|
||||
│ - }
|
||||
│ if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ page cardEntities
|
||||
│ }
|
||||
│ if(tId.txt=="cardGrid")
|
||||
│ {
|
||||
│ page cardGrid
|
||||
│ --- HMI/n2t-out/screensaver2.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
│ + vis nNum6,0
|
||||
│ cardEntities.bco=defaultBcoColor
|
||||
│ - for(sys0=0;sys0<67;sys0++)
|
||||
│ + for(sys0=0;sys0<65;sys0++)
|
||||
│ + for(sys0=0;sys0<90;sys0++)
|
||||
│ {
|
||||
│ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
|
||||
│ {
|
||||
@@ -1049,19 +1049,7 @@
|
||||
│ spstr strCommand.txt,tId.txt,"~",1
|
||||
│ --- HMI/n2t-out/cardPower.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
|
||||
│ @@ -35,27 +35,27 @@
|
||||
│ 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<54;sys0++)
|
||||
│ + for(sys0=0;sys0<48;sys0++)
|
||||
│ {
|
||||
│ if(b[sys0].type==98||b[sys0].type==116)
|
||||
│ {
|
||||
│ @@ -46,16 +46,16 @@
|
||||
│ b[sys0].bco=defaultBcoColor
|
||||
│ b[sys0].pco=defaultFontColor
|
||||
│ }
|
||||
@@ -1432,23 +1420,6 @@
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ @@ -154,15 +148,15 @@
|
||||
│ Text tVersion
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ - Text : 50
|
||||
│ + Text : 49
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
│ Picture p0
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Disable release event after dragging: 0
|
||||
│ @@ -179,15 +173,15 @@
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
@@ -1466,25 +1437,6 @@
|
||||
│ crcputs sys0,2
|
||||
│ crcputs tSend.txt,0
|
||||
│ //send cmd
|
||||
│ @@ -320,18 +314,14 @@
|
||||
│ {
|
||||
│ page pageStartup
|
||||
│ }
|
||||
│ if(tId.txt=="screensaver")
|
||||
│ {
|
||||
│ page screensaver
|
||||
│ }
|
||||
│ - if(tId.txt=="screensaver2")
|
||||
│ - {
|
||||
│ - page screensaver2
|
||||
│ - }
|
||||
│ if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ page cardEntities
|
||||
│ }
|
||||
│ if(tId.txt=="cardGrid")
|
||||
│ {
|
||||
│ page cardGrid
|
||||
│ --- HMI/n2t-out/screensaver.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
@@ -1541,25 +1493,23 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -748,14 +724,18 @@
|
||||
│ {
|
||||
│ page pageStartup
|
||||
│ @@ -750,15 +726,15 @@
|
||||
│ }
|
||||
│ if(tId.txt=="screensaver")
|
||||
│ {
|
||||
│ page screensaver
|
||||
│ }
|
||||
│ + if(tId.txt=="screensaver2")
|
||||
│ + {
|
||||
│ if(tId.txt=="screensaver2")
|
||||
│ {
|
||||
│ - page screensaver
|
||||
│ + page screensaver2
|
||||
│ + }
|
||||
│ }
|
||||
│ if(tId.txt=="cardEntities")
|
||||
│ {
|
||||
│ page cardEntities
|
||||
│ }
|
||||
│ if(tId.txt=="cardGrid")
|
||||
│ {
|
||||
│ page cardGrid
|
||||
│ --- HMI/n2t-out/screensaver2.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2023-02-16 21:36:10.214918888 +0000
|
||||
+++ /dev/fd/62 2023-02-16 21:52:36.451891414 +0000
|
||||
+I/n2t-out/Program.s.txt
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+I/n2t-out/cardEntities.txt
|
||||
@@ -15,6 +15,7 @@
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ for(sys0=0;sys0<67;sys0++)
|
||||
+ for(sys0=0;sys0<90;sys0++)
|
||||
+ }
|
||||
+ if(b[sys0].type==53&&defaultBcoColor==0)
|
||||
+5 +106,57 @@
|
||||
@@ -468,19 +469,7 @@
|
||||
+ }
|
||||
+I/n2t-out/cardPower.txt
|
||||
++ HMI/US/portrait/n2t-out/cardPower.txt
|
||||
+7 +35,27 @@
|
||||
+ 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<54;sys0++)
|
||||
+ for(sys0=0;sys0<48;sys0++)
|
||||
+ {
|
||||
+ if(b[sys0].type==98||b[sys0].type==116)
|
||||
+ {
|
||||
+6 +46,16 @@
|
||||
+ b[sys0].bco=defaultBcoColor
|
||||
+ b[sys0].pco=defaultFontColor
|
||||
+ }
|
||||
@@ -834,42 +823,6 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+15 +148,15 @@
|
||||
+ersion
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+ Text : 50
|
||||
+ Text : 49
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ p0
|
||||
+ributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+18 +314,14 @@
|
||||
+ {
|
||||
+ page pageStartup
|
||||
+ }
|
||||
+ if(tId.txt=="screensaver")
|
||||
+ {
|
||||
+ page screensaver
|
||||
+ }
|
||||
+ if(tId.txt=="screensaver2")
|
||||
+ {
|
||||
+ page screensaver2
|
||||
+ }
|
||||
+ if(tId.txt=="cardEntities")
|
||||
+ {
|
||||
+ page cardEntities
|
||||
+ }
|
||||
+ if(tId.txt=="cardGrid")
|
||||
+ {
|
||||
+ page cardGrid
|
||||
+I/n2t-out/screensaver.txt
|
||||
++ HMI/US/portrait/n2t-out/screensaver.txt
|
||||
+7 +29,14 @@
|
||||
@@ -926,9 +879,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+14 +724,18 @@
|
||||
+ {
|
||||
+ page pageStartup
|
||||
+15 +726,15 @@
|
||||
+ }
|
||||
+ if(tId.txt=="screensaver")
|
||||
+ {
|
||||
@@ -936,6 +887,7 @@
|
||||
+ }
|
||||
+ if(tId.txt=="screensaver2")
|
||||
+ {
|
||||
+ page screensaver
|
||||
+ page screensaver2
|
||||
+ }
|
||||
+ if(tId.txt=="cardEntities")
|
||||
@@ -944,7 +896,6 @@
|
||||
+ }
|
||||
+ if(tId.txt=="cardGrid")
|
||||
+ {
|
||||
+ page cardGrid
|
||||
+I/n2t-out/screensaver2.txt
|
||||
++ HMI/US/portrait/n2t-out/screensaver2.txt
|
||||
+7 +29,14 @@
|
||||
|
||||
@@ -94,7 +94,7 @@ Page cardEntities
|
||||
vis hSlider6,0
|
||||
vis nNum6,0
|
||||
cardEntities.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<65;sys0++)
|
||||
for(sys0=0;sys0<90;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
|
||||
{
|
||||
|
||||
@@ -47,7 +47,7 @@ Page cardPower
|
||||
vis t4Icon,0
|
||||
vis t5Icon,0
|
||||
cardPower.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<48;sys0++)
|
||||
for(sys0=0;sys0<54;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116)
|
||||
{
|
||||
|
||||
@@ -26,10 +26,10 @@ cardQR
|
||||
34 Component(s)
|
||||
406 Line(s) of event code
|
||||
236 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
185 Line(s) of event code
|
||||
131 Unique line(s) of event code
|
||||
cardPower
|
||||
54 Component(s)
|
||||
517 Line(s) of event code
|
||||
339 Unique line(s) of event code
|
||||
cardThermo
|
||||
57 Component(s)
|
||||
536 Line(s) of event code
|
||||
@@ -54,10 +54,10 @@ cardLChart
|
||||
33 Component(s)
|
||||
398 Line(s) of event code
|
||||
264 Unique line(s) of event code
|
||||
cardPower
|
||||
54 Component(s)
|
||||
517 Line(s) of event code
|
||||
339 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
189 Line(s) of event code
|
||||
133 Unique line(s) of event code
|
||||
cardMedia
|
||||
59 Component(s)
|
||||
645 Line(s) of event code
|
||||
@@ -90,5 +90,5 @@ cardEntities
|
||||
Total
|
||||
21 Page(s)
|
||||
811 Component(s)
|
||||
9618 Line(s) of event code
|
||||
2454 Unique line(s) of event code
|
||||
9622 Line(s) of event code
|
||||
2453 Unique line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 49
|
||||
Text : 50
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
@@ -613,6 +613,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -86,7 +86,7 @@ Page cardEntities
|
||||
vis hSlider6,0
|
||||
vis nNum6,0
|
||||
cardEntities.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<65;sys0++)
|
||||
for(sys0=0;sys0<90;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
|
||||
{
|
||||
|
||||
@@ -39,7 +39,7 @@ Page cardPower
|
||||
vis t4Icon,0
|
||||
vis t5Icon,0
|
||||
cardPower.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<48;sys0++)
|
||||
for(sys0=0;sys0<54;sys0++)
|
||||
{
|
||||
if(b[sys0].type==98||b[sys0].type==116)
|
||||
{
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 49
|
||||
Text : 50
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
@@ -318,6 +318,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -50,6 +50,10 @@ cardThermo
|
||||
57 Component(s)
|
||||
536 Line(s) of event code
|
||||
317 Unique line(s) of event code
|
||||
screensaver
|
||||
47 Component(s)
|
||||
434 Line(s) of event code
|
||||
310 Unique line(s) of event code
|
||||
popupInSel
|
||||
34 Component(s)
|
||||
617 Line(s) of event code
|
||||
@@ -78,10 +82,6 @@ popupTimer
|
||||
42 Component(s)
|
||||
512 Line(s) of event code
|
||||
255 Unique line(s) of event code
|
||||
screensaver
|
||||
47 Component(s)
|
||||
430 Line(s) of event code
|
||||
309 Unique line(s) of event code
|
||||
cardEntities
|
||||
67 Component(s)
|
||||
1166 Line(s) of event code
|
||||
@@ -90,5 +90,5 @@ cardEntities
|
||||
Total
|
||||
21 Page(s)
|
||||
802 Component(s)
|
||||
9238 Line(s) of event code
|
||||
9242 Line(s) of event code
|
||||
2340 Unique line(s) of event code
|
||||
|
||||
@@ -1345,6 +1345,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -752,6 +752,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
Reference in New Issue
Block a user