h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-17 02:17:01 +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-03-31 22:36:11 +00:00
committed by GitHub Actions
parent 9a832595f8
commit a867a9e6b3
10 changed files with 84 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:28:25.894497033 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:28:26.694539183 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:36:10.913861716 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -10,8 +10,44 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:28:25.898497244 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:28:26.698539394 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:36:10.913861716 +0000
@@ -211,7 +211,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : 
- Max. Text Size : 5
+ Max. Text Size : 10
Text tIcon2
Attributes
@@ -221,7 +221,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : 
- Max. Text Size : 5
+ Max. Text Size : 30
Text tIcon3
Attributes
@@ -231,7 +231,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : 
- Max. Text Size : 5
+ Max. Text Size : 10
Text tIcon4
Attributes
@@ -241,7 +241,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : 
- Max. Text Size : 5
+ Max. Text Size : 30
Text tSend
Attributes
@@ -1125,33 +1125,6 @@ @@ -1125,33 +1125,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -47,8 +83,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:28:25.898497244 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:28:26.698539394 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:36:10.913861716 +0000
@@ -12,28 +12,307 @@ @@ -12,28 +12,307 @@
Events Events
@@ -408,8 +444,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000 --- HMI/n2t-out/pageIcons.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:28:26.694539183 +0000 +++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:36:10.909861639 +0000
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Attributes Attributes
Scope : global Scope : global
@@ -420,8 +456,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tIcons Text tIcons
Attributes Attributes
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 22:28:25.894497033 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:28:26.694539183 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:36:10.913861716 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event

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-03-31 22:28:25.894497033 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:28:26.298518319 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:36:10.513854100 +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-03-31 22:28:25.898497244 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:28:26.298518319 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:36:10.513854100 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -118,7 +118,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+ Text :  + Text : 
+ Max. Text Size : 30 + Max. Text Size : 5
+ +
+Text tEntity6 +Text tEntity6
+ Attributes + Attributes
@@ -138,7 +138,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+ Text :  + Text : 
+ Max. Text Size : 30 + Max. Text Size : 5
+ +
Picture p0 Picture p0
Attributes Attributes
@@ -780,21 +780,9 @@ 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/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:28:26.298518319 +0000
@@ -20,7 +20,7 @@
Attributes
Scope : global
Text :
- Max. Text Size: 35
+ Max. Text Size: 30
Text tIcons
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-03-31 22:28:25.894497033 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:28:26.298518319 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:36:10.513854100 +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

12
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -537,7 +537,7 @@ Text tIcon1
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -567,7 +567,7 @@ Text tIcon2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -597,7 +597,7 @@ Text tIcon3
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -627,7 +627,7 @@ Text tIcon4
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -807,7 +807,7 @@ Text tIcon5
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -867,7 +867,7 @@ Text tIcon6
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

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

@@ -6,14 +6,14 @@ pageSerialTest
13 Component(s) 13 Component(s)
48 Line(s) of event code 48 Line(s) of event code
43 Unique line(s) of event code 43 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
331 Line(s) of event code 331 Line(s) of event code

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

@@ -30,7 +30,7 @@ Variable (string) vaDate
ID : 6 ID : 6
Scope : global Scope : global
Text : Text :
Max. Text Size: 30 Max. Text Size: 35
Text tIcons Text tIcons
Attributes Attributes

12
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -273,7 +273,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Text tIcon2 Text tIcon2
Attributes Attributes
@@ -283,7 +283,7 @@ Text tIcon2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Text tIcon3 Text tIcon3
Attributes Attributes
@@ -293,7 +293,7 @@ Text tIcon3
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Text tIcon4 Text tIcon4
Attributes Attributes
@@ -303,7 +303,7 @@ Text tIcon4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Text tSend Text tSend
Attributes Attributes
@@ -363,7 +363,7 @@ Text tIcon5
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Text tEntity6 Text tEntity6
Attributes Attributes
@@ -383,7 +383,7 @@ Text tIcon6
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Picture p0 Picture p0
Attributes Attributes

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

@@ -20,7 +20,7 @@ Variable (string) vaDate
Attributes Attributes
Scope : global Scope : global
Text : Text :
Max. Text Size: 30 Max. Text Size: 35
Text tIcons Text tIcons
Attributes Attributes

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

@@ -429,7 +429,7 @@ Text tIcon1
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -459,7 +459,7 @@ Text tIcon2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -489,7 +489,7 @@ Text tIcon3
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -519,7 +519,7 @@ Text tIcon4
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

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

@@ -42,10 +42,6 @@ cardAlarm
35 Component(s) 35 Component(s)
343 Line(s) of event code 343 Line(s) of event code
214 Unique line(s) of event code 214 Unique line(s) of event code
cardEntities
62 Component(s)
970 Line(s) of event code
412 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
428 Line(s) of event code 428 Line(s) of event code
@@ -54,6 +50,10 @@ cardThermo
41 Component(s) 41 Component(s)
458 Line(s) of event code 458 Line(s) of event code
283 Unique line(s) of event code 283 Unique line(s) of event code
cardEntities
62 Component(s)
970 Line(s) of event code
412 Unique line(s) of event code
Total Total
14 Page(s) 14 Page(s)

8
HMI/n2t-out/cardEntities.txt
View File

@@ -211,7 +211,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Text tIcon2 Text tIcon2
Attributes Attributes
@@ -221,7 +221,7 @@ Text tIcon2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Text tIcon3 Text tIcon3
Attributes Attributes
@@ -231,7 +231,7 @@ Text tIcon3
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 5
Text tIcon4 Text tIcon4
Attributes Attributes
@@ -241,7 +241,7 @@ Text tIcon4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text :  Text : 
Max. Text Size : 30 Max. Text Size : 5
Text tSend Text tSend
Attributes Attributes