h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 15:04:24 +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-05-28 05:17:02 +00:00
committed by github-actions[bot]
parent 86e3a1a635
commit 16fc7cb7a6
5 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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-28 05:04:50.360986275 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:04:51.228984325 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:17:01.093876698 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:04:51.232984331 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:17:01.093876698 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-28 05:04:50.364986253 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:04:51.228984325 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:17:01.093876698 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -33,8 +33,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:04:51.228984325 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:17:01.093876698 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
@@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.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/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:04:51.232984331 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:17:01.093876698 +0000
@@ -62,12 +62,6 @@ @@ -62,12 +62,6 @@
Text : Text :
Max. Text Size: 50 Max. Text Size: 50

24
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-28 05:04:50.360986275 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:17:00.497876336 +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-28 05:04:50.364986253 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-28 05:16:59.961876009 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:17:00.501876338 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,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/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-28 05:04:50.364986253 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:17:00.501876338 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -480,8 +480,8 @@ 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/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-28 05:04:50.364986253 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:17:00.501876338 +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
@@ -501,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:17:00.501876338 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
@@ -514,8 +514,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.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-28 05:04:50.364986253 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:17:00.501876338 +0000
@@ -471,22 +471,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,15 +1,15 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:04:50.800983931 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:17:00.521876350 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:17:00.497876336 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:16:59.961876009 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:17:00.501876338 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:17:00.501876338 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:17:00.501876338 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:17:00.501876338 +0000
+@@ -209,9 +209,6 @@ +@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y + sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0 + covx sys0,tTmp.txt,0,0
@@ -20,6 +20,6 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:17:00.501876338 +0000
+@@ -471,22 +471,6 @@ +@@ -471,22 +471,6 @@

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

@@ -26,10 +26,6 @@ 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
screensaver
37 Component(s)
305 Line(s) of event code
244 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -38,6 +34,10 @@ popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 244 Line(s) of event code
138 Unique line(s) of event code 138 Unique line(s) of event code
screensaver
37 Component(s)
305 Line(s) of event code
244 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code

18
HMI/n2t-out-visual/screensaver.txt
View File

@@ -90,10 +90,10 @@ Text tTime
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 37
y coordinate : 4 y coordinate : 0
Width : 451 Width : 376
Height : 150 Height : 154
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -120,9 +120,9 @@ Text tDate
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 38 x coordinate : 0
y coordinate : 154 y coordinate : 154
Width : 375 Width : 450
Height : 38 Height : 38
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -421,7 +421,7 @@ Text tAMPM
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 343 x coordinate : 343
y coordinate : 52 y coordinate : 49
Width : 104 Width : 104
Height : 57 Height : 57
Effect : load Effect : load
@@ -811,7 +811,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 154 y coordinate : 0
Width : 38 Width : 38
Height : 38 Height : 38
Effect : load Effect : load
@@ -841,7 +841,7 @@ Text tIcon2
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 413 x coordinate : 413
y coordinate : 154 y coordinate : 0
Width : 38 Width : 38
Height : 38 Height : 38
Effect : load Effect : load