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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-09-17 20:25:08 +00:00
committed by github-actions[bot]
parent c7deed2dae
commit d7859ca632
18 changed files with 69 additions and 69 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
--- 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 20:03:40.530633799 +0000
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 20:25:03.348580431 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 20:03:40.534633798 +0000
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 20:25:03.348580431 +0000
@@ -786,7 +786,7 @@
Send Component ID : disabled
State : unpressed
@@ -49,8 +49,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Touch Press Event
Only in HMI/n2t-out: cardPower.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 20:03:40.530633799 +0000
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 20:25:03.348580431 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -61,8 +61,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-09-17 20:03:39.418634155 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 20:03:40.534633798 +0000
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 20:25:03.348580431 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event

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

@@ -16,8 +16,8 @@ pageStartup
122 Unique line(s) of event code
popupFan
27 Component(s)
343 Line(s) of event code
200 Unique line(s) of event code
342 Line(s) of event code
199 Unique line(s) of event code
cardMedia
34 Component(s)
389 Line(s) of event code
@@ -26,10 +26,10 @@ cardQR
32 Component(s)
404 Line(s) of event code
235 Unique line(s) of event code
popupShutter
25 Component(s)
389 Line(s) of event code
212 Unique line(s) of event code
popupLight
27 Component(s)
386 Line(s) of event code
211 Unique line(s) of event code
pageTest
14 Component(s)
14 Line(s) of event code
@@ -46,9 +46,9 @@ cardThermo
52 Component(s)
580 Line(s) of event code
303 Unique line(s) of event code
popupLight
27 Component(s)
387 Line(s) of event code
popupShutter
25 Component(s)
389 Line(s) of event code
212 Unique line(s) of event code
cardAlarm
40 Component(s)
@@ -62,5 +62,5 @@ cardEntities
Total
14 Page(s)
439 Component(s)
5274 Line(s) of event code
1416 Unique line(s) of event code
5272 Line(s) of event code
1415 Unique line(s) of event code

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

@@ -759,7 +759,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -794,7 +794,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -468,7 +468,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -467,7 +467,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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
--- 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 20:03:39.950633985 +0000
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:25:02.840570238 +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-09-17 20:03:39.422634154 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:25:02.840570238 +0000
@@ -65,6 +65,16 @@
vis nNum4,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
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:25:02.840570238 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
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-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:25:02.840570238 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
@@ -618,8 +618,8 @@ 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-09-17 20:03:39.418634155 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:03:39.950633985 +0000
--- HMI/n2t-out/popupFan.txt 2022-09-17 20:25:02.380561007 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:25:02.840570238 +0000
@@ -82,23 +82,23 @@
Scope: local
Value: 0

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 20:03:39.966633980 +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 20:03:39.950633985 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 20:25:02.888571201 +0000
+--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:25:02.840570238 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:03:39.422634154 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:03:39.950633985 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:25:02.840570238 +0000
+@@ -65,6 +65,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -38,11 +38,11 @@
++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0
+Only in HMI/n2t-out: cardPower.txt
+--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:03:39.950633985 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:25:02.840570238 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:03:39.950633985 +0000
+--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:25:02.840570238 +0000
+@@ -13,36 +13,6 @@
+ Events
+ Preinitialize Event
@@ -178,8 +178,8 @@
+- }
+-
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
+--- HMI/n2t-out/popupFan.txt 2022-09-17 20:03:39.418634155 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:03:39.950633985 +0000
+--- HMI/n2t-out/popupFan.txt 2022-09-17 20:25:02.380561007 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:25:02.840570238 +0000
+@@ -82,23 +82,23 @@
+ Scope: local
+ Value: 0

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

@@ -16,8 +16,8 @@ popupNotify
143 Unique line(s) of event code
popupLight
27 Component(s)
387 Line(s) of event code
212 Unique line(s) of event code
386 Line(s) of event code
211 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
@@ -26,10 +26,6 @@ cardMedia
34 Component(s)
389 Line(s) of event code
210 Unique line(s) of event code
popupFan
27 Component(s)
343 Line(s) of event code
200 Unique line(s) of event code
popupShutter
25 Component(s)
389 Line(s) of event code
@@ -46,6 +42,10 @@ screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
popupFan
27 Component(s)
342 Line(s) of event code
199 Unique line(s) of event code
cardAlarm
40 Component(s)
422 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total
14 Page(s)
451 Component(s)
5497 Line(s) of event code
1490 Unique line(s) of event code
5495 Line(s) of event code
1489 Unique line(s) of event code

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

@@ -759,7 +759,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -794,7 +794,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -468,7 +468,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -467,7 +467,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -18,18 +18,14 @@ cardGrid
42 Component(s)
469 Line(s) of event code
278 Unique line(s) of event code
popupLight
popupFan
27 Component(s)
387 Line(s) of event code
212 Unique line(s) of event code
342 Line(s) of event code
199 Unique line(s) of event code
popupShutter
25 Component(s)
389 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
34 Component(s)
389 Line(s) of event code
@@ -58,6 +54,10 @@ cardThermo
52 Component(s)
580 Line(s) of event code
303 Unique line(s) of event code
popupLight
27 Component(s)
386 Line(s) of event code
211 Unique line(s) of event code
cardEntities
65 Component(s)
1132 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total
15 Page(s)
493 Component(s)
5714 Line(s) of event code
1557 Unique line(s) of event code
5712 Line(s) of event code
1556 Unique line(s) of event code

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

@@ -759,7 +759,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -794,7 +794,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -468,7 +468,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3

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

@@ -467,7 +467,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
spstr strCommand.txt,tIcon1.txt,"~",2
//spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3