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 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-08-07 21:12:15 +00:00
committed by github-actions[bot]
parent bf7b315437
commit 1d8848d889
12 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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-07-23 14:02:48.223325770 +0000 --- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 14:02:49.219337687 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-07 21:12:09.588765588 +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-07-23 14:02:48.223325770 +0000 --- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 14:02:49.219337687 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-07 21:12:09.592765628 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

@@ -10,10 +10,6 @@ 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
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
@@ -42,6 +38,10 @@ 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
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

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

@@ -117,7 +117,7 @@ Text tEntity
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : tEntity1 Text :
Max. Text Size : 25 Max. Text Size : 25
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -147,7 +147,7 @@ Text tIcon1
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -177,7 +177,7 @@ Text t1
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Speed Text :
Max. Text Size : 50 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -88,7 +88,7 @@ Text tEntity
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 : tEntity1 Text :
Max. Text Size : 25 Max. Text Size : 25
Text tIcon1 Text tIcon1
@@ -98,7 +98,7 @@ Text tIcon1
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 :  Text :
Max. Text Size : 10 Max. Text Size : 10
Text t1 Text t1
@@ -108,7 +108,7 @@ Text t1
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 : Speed Text :
Max. Text Size : 50 Max. Text Size : 50
Text tSend Text tSend

12
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-07-23 14:02:48.223325770 +0000 --- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-07 21:12:08.996759619 +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-07-23 14:02:48.227325818 +0000 --- HMI/n2t-out/cardEntities.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-07 21:12:08.996759619 +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-07-23 14:02:48.223325770 +0000 --- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-07 21:12:08.996759619 +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

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 14:02:48.743331992 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-08-07 21:12:09.012759781 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-23 14:02:48.223325770 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-07 21:12:08.440754014 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 14:02:48.731331848 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-07 21:12:08.996759619 +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-07-23 14:02:48.227325818 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-07 21:12:08.440754014 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 14:02:48.731331848 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-07 21:12:08.996759619 +0000
+@@ -65,6 +65,16 @@ +@@ -65,6 +65,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -33,5 +33,5 @@
++ 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-07-23 14:02:48.223325770 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-07 21:12:08.440754014 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 14:02:48.731331848 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-07 21:12:08.996759619 +0000

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

@@ -18,10 +18,6 @@ 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
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
388 Line(s) of event code 388 Line(s) of event code
@@ -42,6 +38,10 @@ 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

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

@@ -117,7 +117,7 @@ Text tEntity
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : tEntity1 Text :
Max. Text Size : 25 Max. Text Size : 25
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -147,7 +147,7 @@ Text tIcon1
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -177,7 +177,7 @@ Text t1
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Speed Text :
Max. Text Size : 50 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -88,7 +88,7 @@ Text tEntity
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 : tEntity1 Text :
Max. Text Size : 25 Max. Text Size : 25
Text tIcon1 Text tIcon1
@@ -98,7 +98,7 @@ Text tIcon1
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 :  Text :
Max. Text Size : 10 Max. Text Size : 10
Text t1 Text t1
@@ -108,7 +108,7 @@ Text t1
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 : Speed Text :
Max. Text Size : 50 Max. Text Size : 50
Text tSend Text tSend

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

@@ -38,10 +38,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
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
403 Line(s) of event code 403 Line(s) of event code
@@ -50,6 +46,10 @@ cardAlarm
40 Component(s) 40 Component(s)
421 Line(s) of event code 421 Line(s) of event code
254 Unique line(s) of event code 254 Unique line(s) of event code
popupFan
20 Component(s)
236 Line(s) of event code
150 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
580 Line(s) of event code 580 Line(s) of event code

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

@@ -117,7 +117,7 @@ Text tEntity
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : tEntity1 Text :
Max. Text Size : 25 Max. Text Size : 25
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -147,7 +147,7 @@ Text tIcon1
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -177,7 +177,7 @@ Text t1
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Speed Text :
Max. Text Size : 50 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -88,7 +88,7 @@ Text tEntity
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 : tEntity1 Text :
Max. Text Size : 25 Max. Text Size : 25
Text tIcon1 Text tIcon1
@@ -98,7 +98,7 @@ Text tIcon1
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 :  Text :
Max. Text Size : 10 Max. Text Size : 10
Text t1 Text t1
@@ -108,7 +108,7 @@ Text t1
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 : Speed Text :
Max. Text Size : 50 Max. Text Size : 50
Text tSend Text tSend