h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-12 16:17:13 +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 16:42:23 +02:00
parent ab131feaa0 979c60918e
commit df3a008add
6 changed files with 45 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-24 14:34:14.623688759 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:25:39.344117744 +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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-24 14:34:14.627688805 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:25:39.344117744 +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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-24 14:34:14.627688805 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:25:39.344117744 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -32,41 +32,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-24 14:34:14.627688805 +0000
@@ -468,9 +468,6 @@
tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
@@ -509,10 +506,8 @@
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
- tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
- tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
@@ -540,8 +535,12 @@
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20
- covx tTmp.txt,tMRIcon.pco,0,0
+ covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
+ covx tTmp.txt,tMainTextAlt.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",22
+ covx tTmp.txt,tMRIcon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")

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

@@ -18,10 +18,6 @@ pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
115 Unique line(s) of event code 115 Unique line(s) of event code
screensaver
35 Component(s)
296 Line(s) of event code
237 Unique line(s) of event code
cardAlarm cardAlarm
38 Component(s) 38 Component(s)
364 Line(s) of event code 364 Line(s) of event code
@@ -50,6 +46,10 @@ cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
207 Unique line(s) of event code 207 Unique line(s) of event code
screensaver
35 Component(s)
297 Line(s) of event code
238 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
402 Component(s) 402 Component(s)
4458 Line(s) of event code 4459 Line(s) of event code
1167 Unique line(s) of event code 1168 Unique line(s) of event code

11
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -992,6 +992,9 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
@@ -1030,8 +1033,10 @@ Timer tmSerial
covx tTmp.txt,tDate.pco,0,0 covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0 covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0 covx tTmp.txt,tMainText.pco,0,0
tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0 covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",8
@@ -1059,12 +1064,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0 covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMainTextAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tMRIcon.pco,0,0 covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")

11
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -468,6 +468,9 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
@@ -506,8 +509,10 @@ Timer tmSerial
covx tTmp.txt,tDate.pco,0,0 covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0 covx tTmp.txt,tMainIcon.pco,0,0
tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0 covx tTmp.txt,tMainText.pco,0,0
tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0 covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",8
@@ -535,12 +540,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0 covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMainTextAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tMRIcon.pco,0,0 covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")

20
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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:25:38.884113188 +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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-27 14:25:38.480109187 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:25:38.888113228 +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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:25:38.888113228 +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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:25:38.888113228 +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/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-24 14:34:13.723678266 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-27 14:25:38.480109187 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:25:38.888113228 +0000
@@ -455,22 +455,6 @@ @@ -455,22 +455,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,73 +1,11 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-24 14:34:14.183683629 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:25:38.900113346 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:25:38.884113188 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-24 14:34:13.723678266 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:25:38.480109187 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:25:38.888113228 +0000
+ Hotspot mSwipeNext +--- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000
+ Scope : local ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:25:38.888113228 +0000
+@@ -1892,6 +2120,169 @@ +--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000
++ // up button ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:25:38.888113228 +0000
++ spstr tId.txt,tTmp.txt,"|",3 +--- HMI/n2t-out/screensaver.txt 2022-05-27 14:25:38.480109187 +0000
++ if(tTmp.txt=="disable") ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:25:38.888113228 +0000
++ spstr tId.txt,bUp5.txt,"|",0
++ }else if(tTmp.txt=="enable")
++ spstr tId.txt,bUp5.txt,"|",0
++ // stop button
++ spstr tId.txt,tTmp.txt,"|",4
++ if(tTmp.txt=="disable")
++ {
++ bStop5.pco=27501
++ spstr tId.txt,bStop5.txt,"|",1
++ tsw bStop5,0
++ }else if(tTmp.txt=="enable")
++ {
++ bStop5.pco=65535
++ spstr tId.txt,bStop5.txt,"|",1
++ tsw bStop5,1
++ }
++ // down button
++ spstr tId.txt,tTmp.txt,"|",5
++ if(tTmp.txt=="disable")
++ spstr tId.txt,bDown5.txt,"|",2
++ }else if(tTmp.txt=="enable")
++ spstr tId.txt,bDown5.txt,"|",2
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000
+@@ -34,7 +34,7 @@
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 275
++ Max. Text Size: 270
+
+ Variable (string) entn
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000
+@@ -455,22 +455,6 @@
+ vis tMainIconAlt,1
+ vis tMRIcon,1
+ vis tMR,1
+- vis tForecast1,0
+- vis tF1Icon,0
+- vis tForecast1Val,0
+- //move forecast values to the right
+- tForecast4.txt=tForecast3.txt
+- tForecast3.txt=tForecast2.txt
+- tForecast2.txt=tForecast1.txt
+- tForecast4Val.txt=tForecast3Val.txt
+- tForecast3Val.txt=tForecast2Val.txt
+- tForecast2Val.txt=tForecast1Val.txt
+- tF4Icon.txt=tF3Icon.txt
+- tF3Icon.txt=tF2Icon.txt
+- tF2Icon.txt=tF1Icon.txt
+- tF4Icon.pco=tF3Icon.pco
+- tF3Icon.pco=tF2Icon.pco
+- tF2Icon.pco=tF1Icon.pco
+ }
+ //tMR
+ spstr strCommand.txt,tMR.txt,"~",16