h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-18 10:57:01 +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-04-10 15:53:54 +00:00
committed by GitHub Actions
parent fe1332fea6
commit 02ddec8e76
3 changed files with 79 additions and 12 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-10 15:50:47.664175012 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-10 15:53:53.428265648 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 15:50:48.452188951 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 15:53:54.376282837 +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-10 15:50:47.664175012 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-10 15:53:53.428265648 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 15:50:48.452188951 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 15:53:54.376282837 +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-10 15:50:47.664175012 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-10 15:53:53.428265648 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 15:50:48.060182017 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 15:53:53.884273916 +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-10 15:50:47.664175012 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-10 15:53:53.432265720 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 15:50:48.060182017 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 15:53:53.884273916 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -777,8 +777,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-10 15:50:47.664175012 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-10 15:53:53.428265648 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 15:50:48.060182017 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 15:53:53.884273916 +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
@@ -798,8 +798,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-10 15:50:47.664175012 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-10 15:53:53.432265720 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 15:50:48.060182017 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 15:53:53.884273916 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

67
HMI/US/portrait/diff-filtered.txt Normal file
View File

@@ -0,0 +1,67 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-10 15:53:53.924274641 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-10 15:53:53.428265648 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 15:53:53.884273916 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-10 15:53:53.432265720 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 15:53:53.884273916 +0000
+@@ -859,6 +1017,206 @@
+@@ -967,6 +1325,60 @@
+@@ -1072,6 +1484,50 @@
+--- HMI/n2t-out/pageStartup.txt 2022-04-10 15:53:53.428265648 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 15:53:53.884273916 +0000
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-10 15:53:53.432265720 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 15:53:53.884273916 +0000
+@@ -48,6 +48,26 @@
+ Scope: local
+ Value: 0
+
++Text tInstruction
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++ Associated Keyboard : none
++ Text :
++ Max. Text Size : 50
++
++Text tTmp
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++ Associated Keyboard : none
++ Text :
++ Max. Text Size : 50
++
+ Text tTime
+ Attributes
+ Scope : local
+@@ -278,26 +298,6 @@
+ Text :
+ Max. Text Size : 10
+
+-Text tTmp
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 50
+-
+-Text tInstruction
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 50
+-
+ Picture p0
+ Attributes
+ Scope : local