mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-19 22:24:15 +01:00
sync (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
495bd5e8e9
commit
e20a453b64
@@ -32,25 +32,6 @@
|
||||
│ crcputs sys0,2
|
||||
│ crcputs tSend.txt,0
|
||||
│ //send cmd
|
||||
│ @@ -320,18 +320,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/landscape/n2t-out/screensaver.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
@@ -107,85 +88,6 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -590,42 +566,39 @@
|
||||
│ //tMainTextAlt2
|
||||
│ spstr strCommand.txt,tMainTextAlt2.txt,"~",36
|
||||
│ //tMainIconAlt2
|
||||
│ spstr strCommand.txt,tMainIconAlt2.txt,"~",33
|
||||
│ //tMainIconAlt2 Color
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",34
|
||||
│ covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||
│ - if(tMainTextAlt2.txt!="")
|
||||
│ + if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||
│ {
|
||||
│ //value for tMRIcon, activate alternative layout
|
||||
│ vis tMainIcon,0
|
||||
│ vis tMainText,0
|
||||
│ vis tMainTextAlt,1
|
||||
│ vis tMainIconAlt,1
|
||||
│ vis tMainTextAlt2,1
|
||||
│ vis tMainIconAlt2,1
|
||||
│ - if(p0.w!=320)
|
||||
│ - {
|
||||
│ - vis tForecast1,0
|
||||
│ - vis tF1Icon,0
|
||||
│ - vis tForecast1Val,0
|
||||
│ - //move forecast values to the right
|
||||
│ - tForecast4.txt=tForecast3.txt
|
||||
│ - tForecast3.txt=tForecast2.txt
|
||||
│ - tForecast2.txt=tForecast1.txt
|
||||
│ - tForecast4Val.txt=tForecast3Val.txt
|
||||
│ - tForecast3Val.txt=tForecast2Val.txt
|
||||
│ - tForecast2Val.txt=tForecast1Val.txt
|
||||
│ - tF4Icon.txt=tF3Icon.txt
|
||||
│ - tF3Icon.txt=tF2Icon.txt
|
||||
│ - tF2Icon.txt=tF1Icon.txt
|
||||
│ - tF4Icon.pco=tF3Icon.pco
|
||||
│ - tF3Icon.pco=tF2Icon.pco
|
||||
│ - tF2Icon.pco=tF1Icon.pco
|
||||
│ - }
|
||||
│ + vis tForecast1,0
|
||||
│ + vis tF1Icon,0
|
||||
│ + vis tForecast1Val,0
|
||||
│ + //move forecast values to the right
|
||||
│ + tForecast4.txt=tForecast3.txt
|
||||
│ + tForecast3.txt=tForecast2.txt
|
||||
│ + tForecast2.txt=tForecast1.txt
|
||||
│ + tForecast4Val.txt=tForecast3Val.txt
|
||||
│ + tForecast3Val.txt=tForecast2Val.txt
|
||||
│ + tForecast2Val.txt=tForecast1Val.txt
|
||||
│ + tF4Icon.txt=tF3Icon.txt
|
||||
│ + tF3Icon.txt=tF2Icon.txt
|
||||
│ + tF2Icon.txt=tF1Icon.txt
|
||||
│ + tF4Icon.pco=tF3Icon.pco
|
||||
│ + tF3Icon.pco=tF2Icon.pco
|
||||
│ + tF2Icon.pco=tF1Icon.pco
|
||||
│ }else
|
||||
│ {
|
||||
│ vis tMainIcon,1
|
||||
│ vis tMainIconAlt,0
|
||||
│ vis tMainText,1
|
||||
│ vis tMainTextAlt,0
|
||||
│ vis tMainTextAlt2,0
|
||||
│ @@ -748,14 +721,18 @@
|
||||
│ {
|
||||
│ 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/screensaver2.txt
|
||||
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
|
||||
│ @@ -29,17 +29,14 @@
|
||||
|
||||
@@ -16,8 +16,8 @@ popupShutter
|
||||
218 Unique line(s) of event code
|
||||
pageStartup
|
||||
20 Component(s)
|
||||
185 Line(s) of event code
|
||||
131 Unique line(s) of event code
|
||||
189 Line(s) of event code
|
||||
133 Unique line(s) of event code
|
||||
cardLChart
|
||||
33 Component(s)
|
||||
398 Line(s) of event code
|
||||
@@ -76,8 +76,8 @@ cardThermo
|
||||
317 Unique line(s) of event code
|
||||
screensaver
|
||||
46 Component(s)
|
||||
422 Line(s) of event code
|
||||
300 Unique line(s) of event code
|
||||
421 Line(s) of event code
|
||||
302 Unique line(s) of event code
|
||||
screensaver2
|
||||
58 Component(s)
|
||||
344 Line(s) of event code
|
||||
@@ -90,5 +90,5 @@ cardEntities
|
||||
Total
|
||||
21 Page(s)
|
||||
800 Component(s)
|
||||
9215 Line(s) of event code
|
||||
2329 Unique line(s) of event code
|
||||
9218 Line(s) of event code
|
||||
2331 Unique line(s) of event code
|
||||
|
||||
@@ -409,7 +409,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
|
||||
@@ -620,6 +620,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -1143,7 +1143,7 @@ Timer tmSerial
|
||||
//tMainIconAlt2 Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||
if(tMainTextAlt2.txt!="")
|
||||
{
|
||||
//value for tMRIcon, activate alternative layout
|
||||
vis tMainIcon,0
|
||||
@@ -1152,22 +1152,25 @@ Timer tmSerial
|
||||
vis tMainIconAlt,1
|
||||
vis tMainTextAlt2,1
|
||||
vis tMainIconAlt2,1
|
||||
vis tForecast1,0
|
||||
vis tF1Icon,0
|
||||
vis tForecast1Val,0
|
||||
//move forecast values to the right
|
||||
tForecast4.txt=tForecast3.txt
|
||||
tForecast3.txt=tForecast2.txt
|
||||
tForecast2.txt=tForecast1.txt
|
||||
tForecast4Val.txt=tForecast3Val.txt
|
||||
tForecast3Val.txt=tForecast2Val.txt
|
||||
tForecast2Val.txt=tForecast1Val.txt
|
||||
tF4Icon.txt=tF3Icon.txt
|
||||
tF3Icon.txt=tF2Icon.txt
|
||||
tF2Icon.txt=tF1Icon.txt
|
||||
tF4Icon.pco=tF3Icon.pco
|
||||
tF3Icon.pco=tF2Icon.pco
|
||||
tF2Icon.pco=tF1Icon.pco
|
||||
if(p0.w!=320)
|
||||
{
|
||||
vis tForecast1,0
|
||||
vis tF1Icon,0
|
||||
vis tForecast1Val,0
|
||||
//move forecast values to the right
|
||||
tForecast4.txt=tForecast3.txt
|
||||
tForecast3.txt=tForecast2.txt
|
||||
tForecast2.txt=tForecast1.txt
|
||||
tForecast4Val.txt=tForecast3Val.txt
|
||||
tForecast3Val.txt=tForecast2Val.txt
|
||||
tForecast2Val.txt=tForecast1Val.txt
|
||||
tF4Icon.txt=tF3Icon.txt
|
||||
tF3Icon.txt=tF2Icon.txt
|
||||
tF2Icon.txt=tF1Icon.txt
|
||||
tF4Icon.pco=tF3Icon.pco
|
||||
tF3Icon.pco=tF2Icon.pco
|
||||
tF2Icon.pco=tF1Icon.pco
|
||||
}
|
||||
}else
|
||||
{
|
||||
vis tMainIcon,1
|
||||
@@ -1298,10 +1301,6 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -158,7 +158,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
|
||||
@@ -324,6 +324,10 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -570,7 +570,7 @@ Timer tmSerial
|
||||
//tMainIconAlt2 Color
|
||||
spstr strCommand.txt,tTmp.txt,"~",34
|
||||
covx tTmp.txt,tMainIconAlt2.pco,0,0
|
||||
if(tMainTextAlt2.txt!=""&&p0.w!=320)
|
||||
if(tMainTextAlt2.txt!="")
|
||||
{
|
||||
//value for tMRIcon, activate alternative layout
|
||||
vis tMainIcon,0
|
||||
@@ -579,22 +579,25 @@ Timer tmSerial
|
||||
vis tMainIconAlt,1
|
||||
vis tMainTextAlt2,1
|
||||
vis tMainIconAlt2,1
|
||||
vis tForecast1,0
|
||||
vis tF1Icon,0
|
||||
vis tForecast1Val,0
|
||||
//move forecast values to the right
|
||||
tForecast4.txt=tForecast3.txt
|
||||
tForecast3.txt=tForecast2.txt
|
||||
tForecast2.txt=tForecast1.txt
|
||||
tForecast4Val.txt=tForecast3Val.txt
|
||||
tForecast3Val.txt=tForecast2Val.txt
|
||||
tForecast2Val.txt=tForecast1Val.txt
|
||||
tF4Icon.txt=tF3Icon.txt
|
||||
tF3Icon.txt=tF2Icon.txt
|
||||
tF2Icon.txt=tF1Icon.txt
|
||||
tF4Icon.pco=tF3Icon.pco
|
||||
tF3Icon.pco=tF2Icon.pco
|
||||
tF2Icon.pco=tF1Icon.pco
|
||||
if(p0.w!=320)
|
||||
{
|
||||
vis tForecast1,0
|
||||
vis tF1Icon,0
|
||||
vis tForecast1Val,0
|
||||
//move forecast values to the right
|
||||
tForecast4.txt=tForecast3.txt
|
||||
tForecast3.txt=tForecast2.txt
|
||||
tForecast2.txt=tForecast1.txt
|
||||
tForecast4Val.txt=tForecast3Val.txt
|
||||
tForecast3Val.txt=tForecast2Val.txt
|
||||
tForecast2Val.txt=tForecast1Val.txt
|
||||
tF4Icon.txt=tF3Icon.txt
|
||||
tF3Icon.txt=tF2Icon.txt
|
||||
tF2Icon.txt=tF1Icon.txt
|
||||
tF4Icon.pco=tF3Icon.pco
|
||||
tF3Icon.pco=tF2Icon.pco
|
||||
tF2Icon.pco=tF1Icon.pco
|
||||
}
|
||||
}else
|
||||
{
|
||||
vis tMainIcon,1
|
||||
@@ -725,10 +728,6 @@ Timer tmSerial
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="screensaver2")
|
||||
{
|
||||
page screensaver2
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
|
||||
@@ -1432,6 +1432,23 @@
|
||||
│ 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
|
||||
│
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2023-02-14 22:03:05.879411129 +0000
|
||||
+++ /dev/fd/62 2023-02-16 21:36:10.214918888 +0000
|
||||
+I/n2t-out/Program.s.txt
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+I/n2t-out/cardEntities.txt
|
||||
@@ -834,6 +834,23 @@
|
||||
+ 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
|
||||
|
||||
@@ -18,14 +18,14 @@ cardQR
|
||||
34 Component(s)
|
||||
406 Line(s) of event code
|
||||
236 Unique line(s) of event code
|
||||
cardChart
|
||||
33 Component(s)
|
||||
433 Line(s) of event code
|
||||
294 Unique line(s) of event code
|
||||
pageStartup
|
||||
20 Component(s)
|
||||
189 Line(s) of event code
|
||||
133 Unique line(s) of event code
|
||||
cardChart
|
||||
33 Component(s)
|
||||
433 Line(s) of event code
|
||||
294 Unique line(s) of event code
|
||||
pageTest
|
||||
26 Component(s)
|
||||
68 Line(s) of event code
|
||||
|
||||
@@ -409,7 +409,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
|
||||
|
||||
@@ -158,7 +158,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
|
||||
|
||||
Reference in New Issue
Block a user