h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 22:24:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync us-p (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-29 11:37:55 +00:00
committed by github-actions[bot]
parent ca80b8428f
commit 4deca37942
8 changed files with 66 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:14:47.428560992 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 11:37:54.549688631 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/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-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:14:47.428560992 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 11:37:54.549688631 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

94
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-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:14:46.984566754 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:37:54.005674370 +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-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:14:46.984566754 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:37:54.005674370 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -467,46 +467,9 @@ 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/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:14:46.568572153 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:14:46.984566754 +0000
@@ -616,33 +616,25 @@
if(tTmp.txt=="0")
{
vis bPrev,0
- tsw mSwipePrev,0
- tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
- tsw mSwipePrev,1
- tsw mSwipeUp,0
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
- tsw mSwipePrev,0
- tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
- tsw mSwipeNext,0
}
if(tTmp.txt=="1")
{
vis bNext,1
- tsw mSwipeNext,1
bNext.txt=""
}
// get Type
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:14:46.984566754 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:37:54.005674370 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -516,46 +479,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:14:46.568572153 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:14:46.984566754 +0000
@@ -889,33 +889,25 @@
if(tTmp.txt=="0")
{
vis bPrev,0
- tsw mSwipePrev,0
- tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
- tsw mSwipePrev,1
- tsw mSwipeUp,0
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
- tsw mSwipePrev,0
- tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
- tsw mSwipeNext,0
}
if(tTmp.txt=="1")
{
vis bNext,1
- tsw mSwipeNext,1
bNext.txt=""
}
//entity name
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-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:14:46.984566754 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:37:54.005674370 +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
@@ -575,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-29 11:14:46.568572153 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-29 11:37:53.505660975 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:14:46.984566754 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:37:54.005674370 +0000
@@ -471,22 +471,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,87 +1,13 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 11:14:46.996566599 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 11:37:54.025674905 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-29 11:14:46.568572153 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 11:37:53.505660975 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:14:46.984566754 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 11:37:54.005674370 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:14:46.568572153 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 11:37:53.505660975 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:14:46.984566754 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 11:37:54.005674370 +0000
+@@ -1849,6 +2077,169 @@ +@@ -1849,6 +2077,169 @@
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardQR.txt 2022-05-29 11:37:53.505660975 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-29 11:14:46.568572153 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:37:54.005674370 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 11:14:46.984566754 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:37:53.505660975 +0000
+@@ -616,33 +616,25 @@ ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:37:54.005674370 +0000
+ if(tTmp.txt=="0") +--- HMI/n2t-out/screensaver.txt 2022-05-29 11:37:53.505660975 +0000
+ { ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:37:54.005674370 +0000
+ vis bPrev,0
+- tsw mSwipePrev,0
+- tsw mSwipeUp,0
+ }
+ if(tTmp.txt=="1")
+ {
+ vis bPrev,1
+- tsw mSwipePrev,1
+- tsw mSwipeUp,0
+ bPrev.txt=""
+ }
+ if(tTmp.txt=="2")
+ {
+ vis bPrev,1
+- tsw mSwipePrev,0
+- tsw mSwipeUp,1
+ bPrev.txt=""
+ }
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="0")
+ {
+ vis bNext,0
+- tsw mSwipeNext,0
+ }
+ if(tTmp.txt=="1")
+ {
+ vis bNext,1
+- tsw mSwipeNext,1
+ bNext.txt=""
+ }
+ // get Type
+--- HMI/n2t-out/cardQR.txt 2022-05-29 11:14:46.568572153 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 11:14:46.984566754 +0000
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-29 11:14:46.568572153 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 11:14:46.984566754 +0000
+@@ -889,33 +889,25 @@
+ if(tTmp.txt=="0")
+ {
+ vis bPrev,0
+- tsw mSwipePrev,0
+- tsw mSwipeUp,0
+ }
+ if(tTmp.txt=="1")
+ {
+ vis bPrev,1
+- tsw mSwipePrev,1
+- tsw mSwipeUp,0
+ bPrev.txt=""
+ }
+ if(tTmp.txt=="2")
+ {
+ vis bPrev,1
+- tsw mSwipePrev,0
+- tsw mSwipeUp,1
+ bPrev.txt=""
+ }
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="0")
+ {
+ vis bNext,0
+- tsw mSwipeNext,0
+ }
+ if(tTmp.txt=="1")
+ {
+ vis bNext,1
+- tsw mSwipeNext,1
+ bNext.txt=""
+ }
+ //entity name
+--- HMI/n2t-out/pageStartup.txt 2022-05-29 11:14:46.568572153 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 11:14:46.984566754 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-29 11:14:46.568572153 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 11:14:46.984566754 +0000
+@@ -471,22 +471,6 @@ +@@ -471,22 +471,6 @@

8
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -1080,25 +1080,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

8
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -1670,25 +1670,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
//entity name //entity name

18
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -18,18 +18,14 @@ popupNotify
17 Component(s) 17 Component(s)
200 Line(s) of event code 200 Line(s) of event code
125 Unique line(s) of event code 125 Unique line(s) of event code
cardGrid
42 Component(s)
435 Line(s) of event code
256 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
348 Line(s) of event code 348 Line(s) of event code
188 Unique line(s) of event code 188 Unique line(s) of event code
cardGrid
42 Component(s)
427 Line(s) of event code
250 Unique line(s) of event code
cardThermo
56 Component(s)
534 Line(s) of event code
286 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
359 Line(s) of event code 359 Line(s) of event code
@@ -38,6 +34,10 @@ cardMedia
33 Component(s) 33 Component(s)
346 Line(s) of event code 346 Line(s) of event code
181 Unique line(s) of event code 181 Unique line(s) of event code
cardThermo
56 Component(s)
542 Line(s) of event code
292 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 416 Component(s)
4645 Line(s) of event code 4661 Line(s) of event code
1234 Unique line(s) of event code 1234 Unique line(s) of event code

8
HMI/US/portrait/n2t-out/cardGrid.txt
View File

@@ -616,25 +616,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

8
HMI/US/portrait/n2t-out/cardThermo.txt
View File

@@ -889,25 +889,33 @@ Timer tmSerial
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt="" bPrev.txt=""
} }
if(tTmp.txt=="2") if(tTmp.txt=="2")
{ {
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt="" bPrev.txt=""
} }
spstr tId.txt,tTmp.txt,"|",1 spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0") if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt="" bNext.txt=""
} }
//entity name //entity name