h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 21:24:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-22 07:58:31 +00:00
committed by github-actions[bot]
parent 9a0ae4aade
commit 4aebed6807
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 07:58:25.897799068 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:55:05.103784355 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:58:27.009807303 +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-22 07:55:04.215774434 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:55:05.107784400 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:58:27.009807303 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 07:58:25.897799068 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +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-22 07:55:04.219774478 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-22 07:58:25.901799098 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -464,8 +464,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-05-22 07:55:04.215774434 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +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

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:55:04.663779439 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:58:26.469803304 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 07:55:04.215774434 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 07:58:25.897799068 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:55:04.651779305 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:55:04.219774478 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:58:25.901799098 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:55:04.651779305 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1876,6 +2104,165 @@ +@@ -1876,6 +2104,165 @@
@@ -30,5 +30,5 @@
++ { ++ {
++ bDown5.pco=27501 ++ bDown5.pco=27501
++ tsw bDown5,0 ++ tsw bDown5,0
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:55:04.215774434 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:55:04.651779305 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +0000