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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2022-05-27 21:44:50 +02:00
parent 309da812bd 2344b46937
commit 463b41a303
5 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
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-27 19:16:48.789764560 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:16:49.553773382 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:42:39.418054880 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:16:49.553773382 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:42:39.418054880 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-27 19:16:48.789764560 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:16:49.553773382 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:42:39.418054880 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -33,8 +33,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:16:49.553773382 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:42:39.418054880 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 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 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:16:49.553773382 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:42:39.418054880 +0000
@@ -62,12 +62,6 @@ @@ -62,12 +62,6 @@
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
@@ -89,7 +89,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
- Disable release event after dragging: 0 - Disable release event after dragging: 0
- Send Component ID : disabled - Send Component ID : disabled
- Associated Keyboard : none - Associated Keyboard : none
- Text : - Text : 
- Max. Text Size : 5 - Max. Text Size : 5
- -
-Text tIcon2 -Text tIcon2
@@ -99,7 +99,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
- Disable release event after dragging: 0 - Disable release event after dragging: 0
- Send Component ID : disabled - Send Component ID : disabled
- Associated Keyboard : none - Associated Keyboard : none
- Text : - Text : 
- Max. Text Size : 5 - Max. Text Size : 5
- -
Picture p0 Picture p0

28
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-27 19:16:48.789764560 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +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-27 19:16:48.789764560 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,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") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-27 19:16:48.789764560 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +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
@@ -501,8 +501,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 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 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-05-27 19:16:48.789764560 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000
@@ -62,12 +62,6 @@ @@ -62,12 +62,6 @@
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
@@ -557,7 +557,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
- Disable release event after dragging: 0 - Disable release event after dragging: 0
- Send Component ID : disabled - Send Component ID : disabled
- Associated Keyboard : none - Associated Keyboard : none
- Text : - Text : 
- Max. Text Size : 5 - Max. Text Size : 5
- -
-Text tIcon2 -Text tIcon2
@@ -567,7 +567,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
- Disable release event after dragging: 0 - Disable release event after dragging: 0
- Send Component ID : disabled - Send Component ID : disabled
- Associated Keyboard : none - Associated Keyboard : none
- Text : - Text : 
- Max. Text Size : 5 - Max. Text Size : 5
- -
Picture p0 Picture p0

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

@@ -1,15 +1,15 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:16:49.169768948 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:42:38.990089293 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 19:42:38.550124672 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:16:48.789764560 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:42:38.550124672 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000
+@@ -209,9 +209,6 @@ +@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y + sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0 + covx sys0,tTmp.txt,0,0
@@ -20,8 +20,8 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-27 19:42:38.550124672 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000
+@@ -62,12 +62,6 @@ +@@ -62,12 +62,6 @@
+ Text : + Text :
+ Max. Text Size: 50 + Max. Text Size: 50
@@ -63,7 +63,7 @@
+- Disable release event after dragging: 0 +- Disable release event after dragging: 0
+- Send Component ID : disabled +- Send Component ID : disabled
+- Associated Keyboard : none +- Associated Keyboard : none
+- Text : +- Text : 
+- Max. Text Size : 5 +- Max. Text Size : 5
+- +-
+-Text tIcon2 +-Text tIcon2
@@ -73,7 +73,7 @@
+- Disable release event after dragging: 0 +- Disable release event after dragging: 0
+- Send Component ID : disabled +- Send Component ID : disabled
+- Associated Keyboard : none +- Associated Keyboard : none
+- Text : +- Text : 
+- Max. Text Size : 5 +- Max. Text Size : 5
+- +-
+ Picture p0 + Picture p0

24
HMI/n2t-out-visual/screensaver.txt
View File

@@ -120,9 +120,9 @@ Text tDate
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 38
y coordinate : 154 y coordinate : 154
Width : 451 Width : 375
Height : 38 Height : 38
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -810,10 +810,10 @@ Text tIcon1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 344 x coordinate : 0
y coordinate : 2 y coordinate : 154
Width : 50 Width : 38
Height : 45 Height : 38
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -826,7 +826,7 @@ Text tIcon1
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text : 
Max. Text Size : 5 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -840,10 +840,10 @@ Text tIcon2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 400 x coordinate : 413
y coordinate : 2 y coordinate : 154
Width : 45 Width : 38
Height : 45 Height : 38
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -856,7 +856,7 @@ Text tIcon2
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text : 
Max. Text Size : 5 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

4
HMI/n2t-out/screensaver.txt
View File

@@ -315,7 +315,7 @@ Text tIcon1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text : 
Max. Text Size : 5 Max. Text Size : 5
Text tIcon2 Text tIcon2
@@ -325,7 +325,7 @@ Text tIcon2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text : 
Max. Text Size : 5 Max. Text Size : 5
Picture p0 Picture p0