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

Merge branch 'joBr99:main' into main (add nextion2text)

Browse Source
This commit is contained in:
Armilar
2022-06-12 12:27:12 +00:00
committed by github-actions[bot]
parent 8536ad070c
commit 8af9a15eeb
3 changed files with 17 additions and 17 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
--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:21:19.348768343 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:26:59.787287346 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:21:19.348768343 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:26:59.791287389 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

12
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-06-12 12:21:18.432756347 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:26:59.175280756 +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-06-12 12:21:18.436756399 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:26:59.179280799 +0000
@@ -63,6 +63,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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:26:58.639274984 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:26:59.175280756 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-12 12:21:18.904762528 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-12 12:26:59.231281359 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-12 12:26:58.639274984 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:26:59.175280756 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:26:58.639274984 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:26:59.179280799 +0000
+@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@
@@ -12,5 +12,5 @@
+@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:26:58.639274984 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:26:59.175280756 +0000