h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-28 10:24:20 +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
--- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:04:51.228984325 +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:17:01.093876698 +0000
@@ -11,6 +11,4 @@
// dim value
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
page pageStartup
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/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:04:51.232984331 +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:17:01.093876698 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn
Attributes
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/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:04:51.228984325 +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:17:01.093876698 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -33,8 +33,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
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/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:04:51.228984325 +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:17:01.093876698 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
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
crcrest 1,0xffff // reset CRC
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/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:04:51.232984331 +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:17:01.093876698 +0000
@@ -62,12 +62,6 @@
Text :
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
--- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +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:17:00.497876336 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
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/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
@@ -62,6 +62,16 @@
vis bText4,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")
{
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/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
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/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
crcrest 1,0xffff // reset CRC
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/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
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
crcrest 1,0xffff // reset CRC
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/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
@@ -471,22 +471,6 @@
vis tMainIconAlt,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/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +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:16:59.957876007 +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:16:59.961876009 +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:16:59.961876009 +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:16:59.957876007 +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
+--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
+@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0
@@ -20,6 +20,6 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +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:17:00.501876338 +0000
+@@ -471,22 +471,6 @@