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

bump to 41 and fix color on screensaver (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-08-29 19:17:36 +00:00
committed by github-actions[bot]
parent 1c1398562b
commit 3497dfbe39
16 changed files with 99 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
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
--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 18:53:58.331528997 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 19:17:30.983925693 +0000
@@ -14,6 +14,3 @@
//color vars
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
- page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 18:53:58.331528997 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-29 19:17:29.751914398 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 19:17:30.983925693 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 18:53:58.331528997 +0000
--- HMI/n2t-out/pageTest.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 19:17:30.983925693 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
@@ -143,35 +143,3 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
- }
- }
-
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-08-29 18:53:58.335529009 +0000
@@ -510,6 +510,9 @@
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
@@ -606,18 +609,6 @@
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
- if(tMRIcon.txt!=""&&p0.w!=320)
- {
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
- tForecast4Val.pco=tForecast3Val.pco
- tForecast3Val.pco=tForecast2Val.pco
- tForecast2Val.pco=tForecast1Val.pco
- tForecast4.pco=tForecast3.pco
- tForecast3.pco=tForecast2.pco
- tForecast2.pco=tForecast1.pco
- }
}
if(tInstruction.txt=="notify")
{

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

@@ -10,10 +10,6 @@ popupNotify
17 Component(s)
226 Line(s) of event code
143 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
popupFan
20 Component(s)
236 Line(s) of event code
@@ -42,10 +38,14 @@ pageTest
14 Component(s)
14 Line(s) of event code
14 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
screensaver
38 Component(s)
332 Line(s) of event code
257 Unique line(s) of event code
341 Line(s) of event code
263 Unique line(s) of event code
cardThermo
53 Component(s)
580 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total
14 Page(s)
432 Component(s)
5141 Line(s) of event code
1352 Unique line(s) of event code
5150 Line(s) of event code
1358 Unique line(s) of event code

2
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 40
Text : 41
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

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

@@ -1075,9 +1075,6 @@ Timer tmSerial
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
@@ -1174,6 +1171,18 @@ Timer tmSerial
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMRIcon.txt!=""&&p0.w!=320)
{
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco
tForecast4.pco=tForecast3.pco
tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco
}
}
if(tInstruction.txt=="notify")
{

2
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 40
Text : 41
Max. Text Size : 10
Picture p0

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

@@ -510,9 +510,6 @@ Timer tmSerial
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
@@ -609,6 +606,18 @@ Timer tmSerial
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMRIcon.txt!=""&&p0.w!=320)
{
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco
tForecast4.pco=tForecast3.pco
tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco
}
}
if(tInstruction.txt=="notify")
{

48
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
--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 18:53:57.743527237 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 19:17:30.347919862 +0000
@@ -14,6 +14,6 @@
//color vars
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
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 18:53:57.743527237 +0000
--- HMI/n2t-out/cardEntities.txt 2022-08-29 19:17:29.751914398 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 19:17:30.347919862 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 18:53:57.743527237 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-29 19:17:29.751914398 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 19:17:30.347919862 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -479,8 +479,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 18:53:57.743527237 +0000
--- HMI/n2t-out/pageTest.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 19:17:30.347919862 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
@@ -601,35 +601,3 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- }
- }
-
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-08-29 18:53:57.743527237 +0000
@@ -510,6 +510,9 @@
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
@@ -606,18 +609,6 @@
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
- if(tMRIcon.txt!=""&&p0.w!=320)
- {
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
- tForecast4Val.pco=tForecast3Val.pco
- tForecast3Val.pco=tForecast2Val.pco
- tForecast2Val.pco=tForecast1Val.pco
- tForecast4.pco=tForecast3.pco
- tForecast3.pco=tForecast2.pco
- tForecast2.pco=tForecast1.pco
- }
}
if(tInstruction.txt=="notify")
{

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 18:53:57.783527357 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 18:53:57.743527237 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 19:17:30.363920009 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-29 19:17:29.747914361 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 19:17:30.347919862 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 18:53:57.743527237 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-08-29 19:17:29.751914398 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 19:17:30.347919862 +0000
+@@ -65,6 +65,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -33,11 +33,11 @@
++ spstr strCommand.txt,tTmp.txt,"~",32
++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0
+--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 18:53:57.743527237 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-08-29 19:17:29.751914398 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 19:17:30.347919862 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 18:53:57.743527237 +0000
+--- HMI/n2t-out/pageTest.txt 2022-08-29 19:17:29.747914361 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 19:17:30.347919862 +0000
+@@ -13,36 +13,6 @@
+ Events
+ Preinitialize Event
@@ -158,31 +158,3 @@
+- }
+- }
+-
+--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-08-29 18:53:57.743527237 +0000
+@@ -510,6 +510,9 @@
+ tF4Icon.txt=tF3Icon.txt
+ tF3Icon.txt=tF2Icon.txt
+ tF2Icon.txt=tF1Icon.txt
++ tF4Icon.pco=tF3Icon.pco
++ tF3Icon.pco=tF2Icon.pco
++ tF2Icon.pco=tF1Icon.pco
+@@ -606,18 +609,6 @@
+ covx tTmp.txt,tMR.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",22
+ covx tTmp.txt,tTimeAdd.pco,0,0
+- if(tMRIcon.txt!=""&&p0.w!=320)
+- {
+- tF4Icon.pco=tF3Icon.pco
+- tF3Icon.pco=tF2Icon.pco
+- tF2Icon.pco=tF1Icon.pco
+- tForecast4Val.pco=tForecast3Val.pco
+- tForecast3Val.pco=tForecast2Val.pco
+- tForecast2Val.pco=tForecast1Val.pco
+- tForecast4.pco=tForecast3.pco
+- tForecast3.pco=tForecast2.pco
+- tForecast2.pco=tForecast1.pco
+- }
+ }
+ if(tInstruction.txt=="notify")
+ {

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

@@ -18,10 +18,6 @@ popupLight
27 Component(s)
386 Line(s) of event code
211 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
cardMedia
34 Component(s)
388 Line(s) of event code
@@ -42,10 +38,10 @@ cardQR
32 Component(s)
403 Line(s) of event code
234 Unique line(s) of event code
screensaver
38 Component(s)
332 Line(s) of event code
257 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
cardGrid
42 Component(s)
462 Line(s) of event code
@@ -54,6 +50,10 @@ cardAlarm
40 Component(s)
421 Line(s) of event code
254 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
cardThermo
53 Component(s)
580 Line(s) of event code
@@ -62,5 +62,5 @@ cardThermo
Total
14 Page(s)
444 Component(s)
5363 Line(s) of event code
1425 Unique line(s) of event code
5372 Line(s) of event code
1431 Unique line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 40
Text : 41
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

15
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -1075,9 +1075,6 @@ Timer tmSerial
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
@@ -1174,6 +1171,18 @@ Timer tmSerial
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMRIcon.txt!=""&&p0.w!=320)
{
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco
tForecast4.pco=tForecast3.pco
tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco
}
}
if(tInstruction.txt=="notify")
{

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 40
Text : 41
Max. Text Size : 10
Picture p0

15
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -510,9 +510,6 @@ Timer tmSerial
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
@@ -609,6 +606,18 @@ Timer tmSerial
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
if(tMRIcon.txt!=""&&p0.w!=320)
{
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
tForecast4Val.pco=tForecast3Val.pco
tForecast3Val.pco=tForecast2Val.pco
tForecast2Val.pco=tForecast1Val.pco
tForecast4.pco=tForecast3.pco
tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco
}
}
if(tInstruction.txt=="notify")
{

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

@@ -10,10 +10,6 @@ pageTest
19 Component(s)
64 Line(s) of event code
61 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
@@ -22,6 +18,10 @@ screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
popupNotify
17 Component(s)
226 Line(s) of event code

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 40
Text : 41
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

2
HMI/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 40
Text : 41
Max. Text Size : 10
Picture p0