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

Merge pull request #138 from jmbinette/main (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-12 16:20:52 +00:00
committed by GitHub Actions
parent 73e6b9e04d
commit 33dd27ca3e
3 changed files with 21 additions and 21 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-04-12 16:15:30.351143292 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-12 16:20:51.221116465 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:15:31.142989640 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:20:51.993105924 +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/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-04-12 16:15:30.351143292 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-12 16:20:51.221116465 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:15:31.142989640 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:20:51.997105870 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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-04-12 16:15:30.351143292 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-12 16:20:51.221116465 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:15:30.734970090 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:20:51.597111331 +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-04-12 16:15:30.351143292 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-12 16:20:51.221116465 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:15:30.734970090 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:20:51.597111331 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -463,8 +463,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/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-04-12 16:15:30.351143292 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-12 16:20:51.221116465 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:15:30.734970090 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:20:51.597111331 +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
@@ -484,8 +484,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-04-12 16:15:30.351143292 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-12 16:20:51.221116465 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:15:30.734970090 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:20:51.597111331 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 16:15:30.750970856 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 16:20:51.613111113 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-12 16:15:30.351143292 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 16:20:51.221116465 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:15:30.734970090 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:20:51.597111331 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:15:30.351143292 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:20:51.221116465 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:15:30.734970090 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:20:51.597111331 +0000
+@@ -62,6 +62,16 @@ +@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@ +@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@ +@@ -153,6 +175,15 @@
@@ -49,11 +49,11 @@
+@@ -967,6 +1146,33 @@ +@@ -967,6 +1146,33 @@
+@@ -1072,6 +1278,28 @@ +@@ -1072,6 +1278,28 @@
+@@ -1642,6 +1870,128 @@ +@@ -1642,6 +1870,128 @@
+--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:15:30.351143292 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:20:51.221116465 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:15:30.734970090 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:20:51.597111331 +0000
+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-04-12 16:15:30.351143292 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-12 16:20:51.221116465 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:15:30.734970090 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:20:51.597111331 +0000
+@@ -48,6 +48,26 @@ +@@ -48,6 +48,26 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0