h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-06 20:43:20 +00:00
committed by github-actions[bot]
parent 6fbfb7c874
commit 8314bca54d
6 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:41:14.285762803 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:43:15.757379552 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,23 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:41:13.397750333 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:41:14.285762803 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:41:14.285762803 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:43:15.757379552 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

4
HMI/US/landscape/n2t-out-visual/cardGrid.txt
View File

@@ -1310,6 +1310,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

10
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -18,14 +18,14 @@ pageStartup
19 Component(s) 19 Component(s)
157 Line(s) of event code 157 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
259 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
cardGrid
42 Component(s)
436 Line(s) of event code
257 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
@@ -58,5 +58,5 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
412 Component(s) 412 Component(s)
4639 Line(s) of event code 4642 Line(s) of event code
1232 Unique line(s) of event code 1232 Unique line(s) of event code

4
HMI/US/landscape/n2t-out/cardGrid.txt
View File

@@ -846,6 +846,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:41:13.841756568 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:43:15.233352872 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,5 +59,5 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000