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

bump fw to 40 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-08-29 16:07:22 +00:00
committed by github-actions[bot]
parent c2274614d0
commit f46d34b884
16 changed files with 55 additions and 91 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-08-27 15:10:39.613563222 +0000 --- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-27 15:10:40.625595070 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 16:07:17.201614908 +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/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-08-27 15:10:39.613563222 +0000 --- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-27 15:10:40.629595196 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 16:07:17.201614908 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -21,8 +21,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-08-27 15:10:39.613563222 +0000 --- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-27 15:10:40.629595196 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 16:07:17.201614908 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -143,15 +143,3 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
- } - }
- } - }
- -
diff -bur HMI/n2t-out/popupFan.txt HMI/US/landscape/n2t-out/popupFan.txt
--- HMI/n2t-out/popupFan.txt 2022-08-27 15:10:39.617563347 +0000
+++ HMI/US/landscape/n2t-out/popupFan.txt 2022-08-27 15:10:40.629595196 +0000
@@ -39,7 +39,7 @@
prints crcval,2
vis hSpeed,0
popupFan.bco=defaultBcoColor
- for(sys0=0;sys0<20;sys0++)
+ for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{

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

@@ -10,6 +10,14 @@ popupNotify
17 Component(s) 17 Component(s)
226 Line(s) of event code 226 Line(s) of event code
143 Unique 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
150 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
386 Line(s) of event code 386 Line(s) of event code
@@ -34,14 +42,6 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique 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
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
332 Line(s) of event code 332 Line(s) of event code
@@ -63,4 +63,4 @@ Total
14 Page(s) 14 Page(s)
432 Component(s) 432 Component(s)
5141 Line(s) of event code 5141 Line(s) of event code
1351 Unique line(s) of event code 1352 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 Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 39 Text : 40
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -47,7 +47,7 @@ Page popupFan
prints crcval,2 prints crcval,2
vis hSpeed,0 vis hSpeed,0
popupFan.bco=defaultBcoColor popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<20;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -152,7 +152,7 @@ Text tVersion
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 : 39 Text : 40
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

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

@@ -39,7 +39,7 @@ Page popupFan
prints crcval,2 prints crcval,2
vis hSpeed,0 vis hSpeed,0
popupFan.bco=defaultBcoColor popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<20;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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-08-27 15:10:39.613563222 +0000 --- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-27 15:10:40.101578579 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +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-08-27 15:10:39.617563347 +0000 --- HMI/n2t-out/cardEntities.txt 2022-08-29 16:07:16.141624865 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-27 15:10:40.101578579 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +0000
@@ -65,6 +65,16 @@ @@ -65,6 +65,16 @@
vis nNum4,0 vis nNum4,0
vis bPrev,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") if(tInstruction.txt=="pageType")
{ {
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-08-27 15:10:39.613563222 +0000 --- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-27 15:10:40.101578579 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +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
@@ -479,8 +479,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-08-27 15:10:39.613563222 +0000 --- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-27 15:10:40.101578579 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -601,15 +601,3 @@ 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
--- HMI/n2t-out/popupFan.txt 2022-08-27 15:10:39.617563347 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-08-27 15:10:40.101578579 +0000
@@ -39,7 +39,7 @@
prints crcval,2
vis hSpeed,0
popupFan.bco=defaultBcoColor
- for(sys0=0;sys0<20;sys0++)
+ for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-27 15:10:40.121579209 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 16:07:16.689613925 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-27 15:10:39.613563222 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-27 15:10:40.101578579 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +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-08-27 15:10:39.617563347 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-29 16:07:16.141624865 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-27 15:10:40.101578579 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +0000
+@@ -65,6 +65,16 @@ +@@ -65,6 +65,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -33,11 +33,11 @@
++ spstr strCommand.txt,tTmp.txt,"~",32 ++ spstr strCommand.txt,tTmp.txt,"~",32
++ covx tTmp.txt,sys0,0,0 ++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0 ++ btOnOff5.val=sys0
+--- HMI/n2t-out/pageStartup.txt 2022-08-27 15:10:39.613563222 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-27 15:10:40.101578579 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +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-08-27 15:10:39.613563222 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-27 15:10:40.101578579 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000
+@@ -13,36 +13,6 @@ +@@ -13,36 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -158,15 +158,3 @@
+- } +- }
+- } +- }
+- +-
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
+--- HMI/n2t-out/popupFan.txt 2022-08-27 15:10:39.617563347 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-08-27 15:10:40.101578579 +0000
+@@ -39,7 +39,7 @@
+ prints crcval,2
+ vis hSpeed,0
+ popupFan.bco=defaultBcoColor
+- for(sys0=0;sys0<20;sys0++)
++ for(sys0=0;sys0<40;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {

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

@@ -18,14 +18,18 @@ popupLight
27 Component(s) 27 Component(s)
386 Line(s) of event code 386 Line(s) of event code
211 Unique line(s) of event code 211 Unique line(s) of event code
cardMedia
34 Component(s)
388 Line(s) of event code
209 Unique line(s) of event code
pageStartup 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
cardMedia
34 Component(s)
388 Line(s) of event code
209 Unique line(s) of event code
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1348 Line(s) of event code 1348 Line(s) of event code
@@ -38,10 +42,6 @@ cardQR
32 Component(s) 32 Component(s)
403 Line(s) of event code 403 Line(s) of event code
234 Unique line(s) of event code 234 Unique line(s) of event code
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
332 Line(s) of event code 332 Line(s) of event code
@@ -63,4 +63,4 @@ Total
14 Page(s) 14 Page(s)
444 Component(s) 444 Component(s)
5363 Line(s) of event code 5363 Line(s) of event code
1424 Unique line(s) of event code 1425 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 Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 39 Text : 40
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -47,7 +47,7 @@ Page popupFan
prints crcval,2 prints crcval,2
vis hSpeed,0 vis hSpeed,0
popupFan.bco=defaultBcoColor popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<20;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -152,7 +152,7 @@ Text tVersion
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 : 39 Text : 40
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

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

@@ -39,7 +39,7 @@ Page popupFan
prints crcval,2 prints crcval,2
vis hSpeed,0 vis hSpeed,0
popupFan.bco=defaultBcoColor popupFan.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<20;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -10,14 +10,14 @@ pageTest
19 Component(s) 19 Component(s)
64 Line(s) of event code 64 Line(s) of event code
61 Unique line(s) of event code 61 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
211 Unique line(s) of event code
pageStartup 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
popupShutter
25 Component(s)
388 Line(s) of event code
211 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
332 Line(s) of event code 332 Line(s) of event code

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

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

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

@@ -152,7 +152,7 @@ Text tVersion
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 : 39 Text : 40
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0