h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-17 10:27:00 +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 21:51:27 +00:00
committed by GitHub Actions
parent 031b7ce6ec
commit da5c68402c
7 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
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 21:43:25.747084511 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:43:26.723167180 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:51:27.194798213 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -10,8 +10,8 @@ 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 21:43:25.751084850 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:43:26.723167180 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:51:27.194798213 +0000
@@ -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 +47,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 21:43:25.751084850 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:43:26.723167180 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:51:27.194798213 +0000
@@ -12,28 +12,307 @@ @@ -12,28 +12,307 @@
Events Events
@@ -407,9 +407,21 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
// get Type // get Type
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
--- HMI/n2t-out/pageIcons.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 21:51:27.194798213 +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/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 21:43:25.747084511 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:43:26.723167180 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:51:27.194798213 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event
@@ -437,6 +449,15 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -86,7 +106,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : Tuesday, 08. March 2022
- Max. Text Size : 35
+ Max. Text Size : 30
Text tSend
Attributes
@@ -105,7 +125,7 @@ @@ -105,7 +125,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

45
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 21:43:25.747084511 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:43:26.243126523 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:51:26.802801678 +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 21:43:25.751084850 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:43:26.243126523 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:51:26.806801643 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -781,8 +781,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 21:43:25.747084511 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:43:26.243126523 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:51:26.806801643 +0000
@@ -506,55 +506,28 @@ @@ -506,55 +506,28 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
@@ -866,8 +866,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
{ {
vis t5,0 vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 21:43:25.751084850 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:43:26.243126523 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:51:26.806801643 +0000
@@ -643,53 +643,26 @@ @@ -643,53 +643,26 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
@@ -1195,9 +1195,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 21:51:26.802801678 +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 21:43:25.747084511 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:43:26.243126523 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:51:26.806801643 +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
@@ -1217,8 +1229,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 21:43:25.747084511 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:43:26.243126523 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:51:26.806801643 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event
@@ -1246,6 +1258,15 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -86,7 +106,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : Tuesday, 08. March 2022
- Max. Text Size : 35
+ Max. Text Size : 30
Text tSend
Attributes
@@ -105,7 +125,7 @@ @@ -105,7 +125,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -2,10 +2,6 @@ Program.s
0 Component(s) 0 Component(s)
11 Line(s) of event code 11 Line(s) of event code
11 Unique line(s) of event code 11 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageTest pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
@@ -14,6 +10,10 @@ 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

2
HMI/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

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

@@ -174,7 +174,7 @@ Text tDate
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Tuesday, 08. March 2022 Text : Tuesday, 08. March 2022
Max. Text Size : 30 Max. Text Size : 35
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

2
HMI/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

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

@@ -86,7 +86,7 @@ Text tDate
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Tuesday, 08. March 2022 Text : Tuesday, 08. March 2022
Max. Text Size : 30 Max. Text Size : 35
Text tSend Text tSend
Attributes Attributes