h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 23:44:25 +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-09-17 22:24:38 +02:00
parent e8f0f227bd cf378026b2
commit c7deed2dae
12 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/Program.s.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 19:57:24.536216256 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 20:03:40.530633799 +0000
@@ -14,6 +14,3 @@ @@ -14,6 +14,3 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 19:57:24.536216256 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 20:03:40.534633798 +0000
@@ -786,7 +786,7 @@ @@ -786,7 +786,7 @@
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
@@ -49,8 +49,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Touch Press Event Touch Press Event
Only in HMI/n2t-out: cardPower.txt Only in HMI/n2t-out: cardPower.txt
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-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 19:57:24.536216256 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 20:03:40.530633799 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -61,8 +61,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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/pageTest.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 19:57:24.536216256 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 20:03:40.534633798 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event

10
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -14,14 +14,14 @@ pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 167 Line(s) of event code
122 Unique line(s) of event code 122 Unique line(s) of event code
popupFan
27 Component(s)
343 Line(s) of event code
200 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
389 Line(s) of event code 389 Line(s) of event code
210 Unique line(s) of event code 210 Unique line(s) of event code
popupFan
27 Component(s)
342 Line(s) of event code
199 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
404 Line(s) of event code 404 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total Total
14 Page(s) 14 Page(s)
439 Component(s) 439 Component(s)
5273 Line(s) of event code 5274 Line(s) of event code
1416 Unique line(s) of event code 1416 Unique line(s) of event code

1
HMI/US/landscape/n2t-out-visual/popupFan.txt
View File

@@ -25,6 +25,7 @@ Page popupFan
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/US/landscape/n2t-out/popupFan.txt
View File

@@ -17,6 +17,7 @@ Page popupFan
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

30
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-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/Program.s.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 19:57:24.072211415 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:03:39.950633985 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -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-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 19:57:24.072211415 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:03:39.950633985 +0000
@@ -65,6 +65,16 @@ @@ -65,6 +65,16 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
@@ -460,8 +460,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
{ {
Only in HMI/n2t-out: cardPower.txt Only in HMI/n2t-out: cardPower.txt
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-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 19:57:24.072211415 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:03:39.950633985 +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
@@ -481,8 +481,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/pageTest.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 19:57:24.072211415 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:03:39.950633985 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -618,9 +618,9 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- } - }
- -
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
--- HMI/n2t-out/popupFan.txt 2022-09-17 19:57:23.628206782 +0000 --- HMI/n2t-out/popupFan.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 19:57:24.072211415 +0000 +++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:03:39.950633985 +0000
@@ -81,23 +81,23 @@ @@ -82,23 +82,23 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -651,7 +651,7 @@ diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
Variable (string) tSend Variable (string) tSend
Attributes Attributes
Scope : local Scope : local
@@ -256,7 +256,7 @@ @@ -257,7 +257,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -660,7 +660,7 @@ diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -271,7 +271,7 @@ @@ -272,7 +272,7 @@
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","
@@ -669,7 +669,7 @@ diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
covx sys2,tTmp.txt,0,0 covx sys2,tTmp.txt,0,0
tSend.txt+="mode-sel,"+tTmp.txt tSend.txt+="mode-sel,"+tTmp.txt
//send calc crc //send calc crc
@@ -286,7 +286,7 @@ @@ -287,7 +287,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -678,7 +678,7 @@ diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -301,7 +301,7 @@ @@ -302,7 +302,7 @@
//craft command //craft command
tSend.txt="event,buttonPress2," tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+"," tSend.txt+=entn.txt+","

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 19:57:24.084211540 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 20:03:39.966633980 +0000
+--- HMI/n2t-out/Program.s.txt 2022-09-17 19:57:23.628206782 +0000 +--- HMI/n2t-out/Program.s.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 19:57:24.072211415 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:03:39.950633985 +0000
+@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@
+ //color vars + //color vars
+ int defaultFontColor=65535 + int defaultFontColor=65535
+ int defaultBcoColor=6371 + int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-09-17 19:57:23.628206782 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 19:57:24.072211415 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:03:39.950633985 +0000
+@@ -65,6 +65,16 @@ +@@ -65,6 +65,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -38,11 +38,11 @@
++ covx tTmp.txt,sys0,0,0 ++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0 ++ btOnOff5.val=sys0
+Only in HMI/n2t-out: cardPower.txt +Only in HMI/n2t-out: cardPower.txt
+--- HMI/n2t-out/pageStartup.txt 2022-09-17 19:57:23.628206782 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 19:57:24.072211415 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:03:39.950633985 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-09-17 19:57:23.628206782 +0000 +--- HMI/n2t-out/pageTest.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 19:57:24.072211415 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:03:39.950633985 +0000
+@@ -13,36 +13,6 @@ +@@ -13,36 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -178,9 +178,9 @@
+- } +- }
+- +-
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt +diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
+--- HMI/n2t-out/popupFan.txt 2022-09-17 19:57:23.628206782 +0000 +--- HMI/n2t-out/popupFan.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 19:57:24.072211415 +0000 ++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:03:39.950633985 +0000
+@@ -81,23 +81,23 @@ +@@ -82,23 +82,23 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
+ +
@@ -211,7 +211,7 @@
+ Variable (string) tSend + Variable (string) tSend
+ Attributes + Attributes
+ Scope : local + Scope : local
+@@ -256,7 +256,7 @@ +@@ -257,7 +257,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -220,7 +220,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -271,7 +271,7 @@ +@@ -272,7 +272,7 @@
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2," + tSend.txt="event,buttonPress2,"
+ tSend.txt+=entn.txt+"," + tSend.txt+=entn.txt+","
@@ -229,7 +229,7 @@
+ covx sys2,tTmp.txt,0,0 + covx sys2,tTmp.txt,0,0
+ tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-sel,"+tTmp.txt
+ //send calc crc + //send calc crc
+@@ -286,7 +286,7 @@ +@@ -287,7 +287,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
@@ -238,7 +238,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+@@ -301,7 +301,7 @@ +@@ -302,7 +302,7 @@
+ //craft command + //craft command
+ tSend.txt="event,buttonPress2," + tSend.txt="event,buttonPress2,"
+ tSend.txt+=entn.txt+"," + tSend.txt+=entn.txt+","

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

@@ -28,8 +28,8 @@ cardMedia
210 Unique line(s) of event code 210 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
342 Line(s) of event code 343 Line(s) of event code
199 Unique line(s) of event code 200 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
389 Line(s) of event code 389 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total Total
14 Page(s) 14 Page(s)
451 Component(s) 451 Component(s)
5496 Line(s) of event code 5497 Line(s) of event code
1490 Unique line(s) of event code 1490 Unique line(s) of event code

1
HMI/US/portrait/n2t-out-visual/popupFan.txt
View File

@@ -25,6 +25,7 @@ Page popupFan
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/US/portrait/n2t-out/popupFan.txt
View File

@@ -17,6 +17,7 @@ Page popupFan
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

10
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -6,10 +6,6 @@ pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
popupFan
27 Component(s)
342 Line(s) of event code
199 Unique line(s) of event code
pageTest pageTest
20 Component(s) 20 Component(s)
65 Line(s) of event code 65 Line(s) of event code
@@ -30,6 +26,10 @@ popupShutter
25 Component(s) 25 Component(s)
389 Line(s) of event code 389 Line(s) of event code
212 Unique line(s) of event code 212 Unique line(s) of event code
popupFan
27 Component(s)
343 Line(s) of event code
200 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
389 Line(s) of event code 389 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
493 Component(s) 493 Component(s)
5713 Line(s) of event code 5714 Line(s) of event code
1557 Unique line(s) of event code 1557 Unique line(s) of event code

1
HMI/n2t-out-visual/popupFan.txt
View File

@@ -25,6 +25,7 @@ Page popupFan
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/n2t-out/popupFan.txt
View File

@@ -17,6 +17,7 @@ Page popupFan
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0