h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-17 10:27:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-10-15 12:55:16 +00:00
committed by github-actions[bot]
parent ee6da21914
commit 898dadf50c
6 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
HMI/US/landscape/diff-eu-version.txt
View File

@@ -48,8 +48,8 @@
│ b2.pco=defaultFontColor │ b2.pco=defaultFontColor
│ - vis tIcon,0 │ - vis tIcon,0
│ - vis tTextAlt,0 │ - vis tTextAlt,0
│ - tIcon.bco=defaultFontColor │ - tIcon.pco=defaultFontColor
│ - tTextAlt.bco=defaultFontColor │ - tTextAlt.pco=defaultFontColor
│ │
│ Variable (string) strCommand │ Variable (string) strCommand
│ Attributes │ Attributes
@@ -92,7 +92,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -325,26 +299,14 @@ │ @@ -325,33 +299,14 @@
│ tText.pco=sys0 │ tText.pco=sys0
│ //preserve old sleepTimeout │ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout │ vaOldSleepT.val=sleepTimeout
@@ -100,10 +100,12 @@
│ spstr strCommand.txt,tTmp.txt,"~",10 │ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0 │ covx tTmp.txt,sys0,0,0
│ sleepTimeout=sys0 │ sleepTimeout=sys0
│ - //font size
│ - spstr strCommand.txt,tTmp.txt,"~",11 │ - spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,sys0,0,0 │ - covx tTmp.txt,sys0,0,0
│ - tTextAlt.font=sys0 │ - tTextAlt.font=sys0
│ - tText.font=sys0 │ - tText.font=sys0
│ - //icon
│ - spstr strCommand.txt,tIcon.txt,"~",12 │ - spstr strCommand.txt,tIcon.txt,"~",12
│ - if(tIcon.txt!="") │ - if(tIcon.txt!="")
│ - { │ - {
@@ -111,7 +113,12 @@
│ - vis tTextAlt,1 │ - vis tTextAlt,1
│ - vis tText,0 │ - vis tText,0
│ - tTextAlt.txt=tText.txt │ - tTextAlt.txt=tText.txt
│ - tTextAlt.pco=tText.pco
│ - } │ - }
│ - // alt icon color
│ - spstr strCommand.txt,tTmp.txt,"~",13
│ - covx tTmp.txt,sys0,0,0
│ - tIcon.pco=sys0
│ } │ }
│ if(tInstruction.txt=="time") │ if(tInstruction.txt=="time")
│ { │ {

13
HMI/US/portrait/diff-eu-version.txt
View File

@@ -709,8 +709,8 @@
│ b2.pco=defaultFontColor │ b2.pco=defaultFontColor
│ - vis tIcon,0 │ - vis tIcon,0
│ - vis tTextAlt,0 │ - vis tTextAlt,0
│ - tIcon.bco=defaultFontColor │ - tIcon.pco=defaultFontColor
│ - tTextAlt.bco=defaultFontColor │ - tTextAlt.pco=defaultFontColor
│ │
│ Variable (string) strCommand │ Variable (string) strCommand
│ Attributes │ Attributes
@@ -753,7 +753,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -325,26 +299,14 @@ │ @@ -325,33 +299,14 @@
│ tText.pco=sys0 │ tText.pco=sys0
│ //preserve old sleepTimeout │ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout │ vaOldSleepT.val=sleepTimeout
@@ -761,10 +761,12 @@
│ spstr strCommand.txt,tTmp.txt,"~",10 │ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0 │ covx tTmp.txt,sys0,0,0
│ sleepTimeout=sys0 │ sleepTimeout=sys0
│ - //font size
│ - spstr strCommand.txt,tTmp.txt,"~",11 │ - spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,sys0,0,0 │ - covx tTmp.txt,sys0,0,0
│ - tTextAlt.font=sys0 │ - tTextAlt.font=sys0
│ - tText.font=sys0 │ - tText.font=sys0
│ - //icon
│ - spstr strCommand.txt,tIcon.txt,"~",12 │ - spstr strCommand.txt,tIcon.txt,"~",12
│ - if(tIcon.txt!="") │ - if(tIcon.txt!="")
│ - { │ - {
@@ -772,7 +774,12 @@
│ - vis tTextAlt,1 │ - vis tTextAlt,1
│ - vis tText,0 │ - vis tText,0
│ - tTextAlt.txt=tText.txt │ - tTextAlt.txt=tText.txt
│ - tTextAlt.pco=tText.pco
│ - } │ - }
│ - // alt icon color
│ - spstr strCommand.txt,tTmp.txt,"~",13
│ - covx tTmp.txt,sys0,0,0
│ - tIcon.pco=sys0
│ } │ }
│ if(tInstruction.txt=="time") │ if(tInstruction.txt=="time")
│ { │ {

15
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-15 12:20:50.585699560 +0000 +++ /dev/fd/62 2022-10-15 12:55:10.725304315 +0000
+geIcons.txt +geIcons.txt
+5 +15,15 @@ +5 +15,15 @@
+ Scope : global + Scope : global
@@ -35,8 +35,8 @@
+ b2.pco=defaultFontColor + b2.pco=defaultFontColor
+ vis tIcon,0 + vis tIcon,0
+ vis tTextAlt,0 + vis tTextAlt,0
+ tIcon.bco=defaultFontColor + tIcon.pco=defaultFontColor
+ tTextAlt.bco=defaultFontColor + tTextAlt.pco=defaultFontColor
+ +
+e (string) strCommand +e (string) strCommand
+ributes +ributes
@@ -79,7 +79,7 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ +
+26 +299,14 @@ +33 +299,14 @@
+ tText.pco=sys0 + tText.pco=sys0
+ //preserve old sleepTimeout + //preserve old sleepTimeout
+ vaOldSleepT.val=sleepTimeout + vaOldSleepT.val=sleepTimeout
@@ -87,10 +87,12 @@
+ spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ sleepTimeout=sys0 + sleepTimeout=sys0
+ //font size
+ spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ tTextAlt.font=sys0 + tTextAlt.font=sys0
+ tText.font=sys0 + tText.font=sys0
+ //icon
+ spstr strCommand.txt,tIcon.txt,"~",12 + spstr strCommand.txt,tIcon.txt,"~",12
+ if(tIcon.txt!="") + if(tIcon.txt!="")
+ { + {
@@ -98,7 +100,12 @@
+ vis tTextAlt,1 + vis tTextAlt,1
+ vis tText,0 + vis tText,0
+ tTextAlt.txt=tText.txt + tTextAlt.txt=tText.txt
+ tTextAlt.pco=tText.pco
+ } + }
+ // alt icon color
+ spstr strCommand.txt,tTmp.txt,"~",13
+ covx tTmp.txt,sys0,0,0
+ tIcon.pco=sys0
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -20,8 +20,8 @@ popupLight
214 Unique line(s) of event code 214 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
249 Line(s) of event code 253 Line(s) of event code
161 Unique line(s) of event code 164 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
172 Line(s) of event code 172 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
490 Component(s) 490 Component(s)
5815 Line(s) of event code 5819 Line(s) of event code
1575 Unique line(s) of event code 1576 Unique line(s) of event code

11
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -42,8 +42,8 @@ Page popupNotify
b2.pco=defaultFontColor b2.pco=defaultFontColor
vis tIcon,0 vis tIcon,0
vis tTextAlt,0 vis tTextAlt,0
tIcon.bco=defaultFontColor tIcon.pco=defaultFontColor
tTextAlt.bco=defaultFontColor tTextAlt.pco=defaultFontColor
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -559,10 +559,12 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
//font size
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tTextAlt.font=sys0 tTextAlt.font=sys0
tText.font=sys0 tText.font=sys0
//icon
spstr strCommand.txt,tIcon.txt,"~",12 spstr strCommand.txt,tIcon.txt,"~",12
if(tIcon.txt!="") if(tIcon.txt!="")
{ {
@@ -570,7 +572,12 @@ Timer tmSerial
vis tTextAlt,1 vis tTextAlt,1
vis tText,0 vis tText,0
tTextAlt.txt=tText.txt tTextAlt.txt=tText.txt
tTextAlt.pco=tText.pco
} }
// alt icon color
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

11
HMI/n2t-out/popupNotify.txt
View File

@@ -34,8 +34,8 @@ Page popupNotify
b2.pco=defaultFontColor b2.pco=defaultFontColor
vis tIcon,0 vis tIcon,0
vis tTextAlt,0 vis tTextAlt,0
tIcon.bco=defaultFontColor tIcon.pco=defaultFontColor
tTextAlt.bco=defaultFontColor tTextAlt.pco=defaultFontColor
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -329,10 +329,12 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
sleepTimeout=sys0 sleepTimeout=sys0
//font size
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tTextAlt.font=sys0 tTextAlt.font=sys0
tText.font=sys0 tText.font=sys0
//icon
spstr strCommand.txt,tIcon.txt,"~",12 spstr strCommand.txt,tIcon.txt,"~",12
if(tIcon.txt!="") if(tIcon.txt!="")
{ {
@@ -340,7 +342,12 @@ Timer tmSerial
vis tTextAlt,1 vis tTextAlt,1
vis tText,0 vis tText,0
tTextAlt.txt=tText.txt tTextAlt.txt=tText.txt
tTextAlt.pco=tText.pco
} }
// alt icon color
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,sys0,0,0
tIcon.pco=sys0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {