h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 15:34:26 +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:
Johannes
2022-05-28 21:48:18 +02:00
parent e21e9a8ea0 d5acd72424
commit 17465793b3
6 changed files with 37 additions and 57 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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:31:25.423829253 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:37:52.963174145 +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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:31:25.423829253 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:37:52.963174145 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

33
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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +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
@@ -500,22 +500,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
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
--- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
- tSend.txt+="|"
- covx pColorWheel.h,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
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-28 19:31:24.471828653 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000
@@ -471,22 +471,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,25 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:31:24.959828961 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:37:52.515167909 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-28 19:31:24.471828653 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:31:24.471828653 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:37:52.051161450 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 19:31:24.471828653 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 19:37:52.051161450 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +--- HMI/n2t-out/screensaver.txt 2022-05-28 19:37:52.051161450 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000
+@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+- tSend.txt+="|"
+- covx pColorWheel.h,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-28 19:31:24.471828653 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000
+@@ -471,22 +471,6 @@ +@@ -471,22 +471,6 @@

12
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -18,10 +18,6 @@ cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code
254 Unique line(s) of event code 254 Unique line(s) of event code
popupLight
27 Component(s)
345 Line(s) of event code
187 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -38,6 +34,10 @@ cardMedia
33 Component(s) 33 Component(s)
350 Line(s) of event code 350 Line(s) of event code
179 Unique line(s) of event code 179 Unique line(s) of event code
popupLight
27 Component(s)
348 Line(s) of event code
188 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 416 Component(s)
4682 Line(s) of event code 4685 Line(s) of event code
1231 Unique line(s) of event code 1232 Unique line(s) of event code

3
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -461,6 +461,9 @@ Picture pColorWheel
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

3
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -209,6 +209,9 @@ Picture pColorWheel
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC