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

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

Browse Source
This commit is contained in:
joBr99
2022-11-30 23:21:33 +00:00
committed by github-actions[bot]
parent 994eba88fb
commit 9365c48d1a
8 changed files with 383 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,7 +408,76 @@
│ }
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -351,15 +351,15 @@
│ @@ -29,29 +29,20 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
│ vis tSend,0
│ //page open event
│ // clear weather elements, to keep example content in HMI
│
│ - Postinitialize Event
│ - click m0,1
│ -
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 200
│
│ -Variable (string) strTmp
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 2
│ -
│ Variable (string) tId
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 25
│
│ Variable (string) tInstruction
│ @@ -103,38 +94,14 @@
│ Value: 0
│
│ Variable (int32) ycR
│ Attributes
│ Scope: local
│ Value: 0
│
│ -Text m0
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - if(tDate.x==0)
│ - {
│ - tTmp.txt="change model conf to us-l/p "
│ - strlen tTmp.txt,sys1
│ - sya1=sys1*11+m0.h-48/2
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x,sys0*-11+m0.y+sya1,30,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ - }
│ -
│ Text t10
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -384,15 +351,15 @@
│ Text tTime
│ Attributes
│ Scope : local
@@ -425,3 +494,19 @@
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -596,15 +563,14 @@
│ spstr strCommand.txt,tIcon1.txt,"~",17
│ spstr strCommand.txt,tTmp.txt,"~",18
│ covx tTmp.txt,tIcon1.pco,0,0
│ //statusIcon2
│ spstr strCommand.txt,tIcon2.txt,"~",19
│ spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,tIcon2.pco,0,0
│ - click m0,1
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ {

87
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1048,3 +1048,90 @@
│ }
│ }
│ }
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,29 +29,20 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
│ vis tSend,0
│ //page open event
│ // clear weather elements, to keep example content in HMI
│
│ - Postinitialize Event
│ - click m0,1
│ -
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 200
│
│ -Variable (string) strTmp
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 2
│ -
│ Variable (string) tId
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 25
│
│ Variable (string) tInstruction
│ @@ -103,38 +94,14 @@
│ Value: 0
│
│ Variable (int32) ycR
│ Attributes
│ Scope: local
│ Value: 0
│
│ -Text m0
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - if(tDate.x==0)
│ - {
│ - tTmp.txt="change model conf to us-l/p "
│ - strlen tTmp.txt,sys1
│ - sya1=sys1*11+m0.h-48/2
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x,sys0*-11+m0.y+sya1,30,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ - }
│ -
│ Text t10
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -596,15 +563,14 @@
│ spstr strCommand.txt,tIcon1.txt,"~",17
│ spstr strCommand.txt,tTmp.txt,"~",18
│ covx tTmp.txt,tIcon1.pco,0,0
│ //statusIcon2
│ spstr strCommand.txt,tIcon2.txt,"~",19
│ spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,tIcon2.pco,0,0
│ - click m0,1
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ {

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-11-30 18:11:43.676263963 +0000
+++ /dev/fd/62 2022-11-30 23:21:26.326817245 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardChart.txt
@@ -404,3 +404,90 @@
+ }
+ }
+ }
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+9 +29,20 @@
+ }
+ tDate.txt=pageIcons.vaDate.txt
+ dim=dimValue
+ vis tSend,0
+ //page open event
+ // clear weather elements, to keep example content in HMI
+
+ Postinitialize Event
+ click m0,1
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 200
+
+e (string) strTmp
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 2
+
+e (string) tId
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 25
+
+e (string) tInstruction
+38 +94,14 @@
+ Value: 0
+
+e (int32) ycR
+ributes
+ Scope: local
+ Value: 0
+
+
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ if(tDate.x==0)
+ {
+ tTmp.txt="change model conf to us-l/p "
+ strlen tTmp.txt,sys1
+ sya1=sys1*11+m0.h-48/2
+ for(sys0=0;sys0<sys1;sys0++)
+ {
+ substr tTmp.txt,strTmp.txt,sys0,1
+ xstr m0.x,sys0*-11+m0.y+sya1,30,20,6,WHITE,RED,2,1,3,strTmp.txt
+ }
+ }
+
+0
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+15 +563,14 @@
+ spstr strCommand.txt,tIcon1.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",18
+ covx tTmp.txt,tIcon1.pco,0,0
+ //statusIcon2
+ spstr strCommand.txt,tIcon2.txt,"~",19
+ spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,tIcon2.pco,0,0
+ click m0,1
+ }
+ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ {
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco)
+ {

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

@@ -6,6 +6,10 @@ pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageTest
21 Component(s)
65 Line(s) of event code
63 Unique line(s) of event code
popupShutter
25 Component(s)
394 Line(s) of event code
@@ -22,10 +26,6 @@ pageStartup
19 Component(s)
181 Line(s) of event code
129 Unique line(s) of event code
pageTest
21 Component(s)
66 Line(s) of event code
64 Unique line(s) of event code
popupInSel
34 Component(s)
529 Line(s) of event code
@@ -67,9 +67,9 @@ cardThermo
612 Line(s) of event code
318 Unique line(s) of event code
screensaver
45 Component(s)
400 Line(s) of event code
296 Unique line(s) of event code
47 Component(s)
413 Line(s) of event code
305 Unique line(s) of event code
cardEntities
65 Component(s)
1169 Line(s) of event code
@@ -77,6 +77,6 @@ cardEntities
Total
18 Page(s)
610 Component(s)
7603 Line(s) of event code
1961 Unique line(s) of event code
612 Component(s)
7615 Line(s) of event code
1970 Unique line(s) of event code

52
HMI/n2t-out-visual/pageTest.txt
View File

@@ -272,42 +272,6 @@ Button b12
Touch Press Event
page cardPower
Button b13
Attributes
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 129
y coordinate : 216
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 1
Back. Color : 50712
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : insel
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
page popupThermo
Button b2
Attributes
ID : 13
@@ -597,6 +561,22 @@ Button b9
Touch Press Event
page popupNotify
Hotspot m0
Attributes
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 225
y coordinate : 81
Width : 60
Height : 215
Effect : load
Effect Priority : 0
Effect Time : 300
Timer tmSerial
Attributes
ID : 14

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

@@ -41,6 +41,9 @@ Page screensaver
//page open event
// clear weather elements, to keep example content in HMI
Postinitialize Event
click m0,1
Variable (string) strCommand
Attributes
ID : 4
@@ -48,6 +51,13 @@ Variable (string) strCommand
Text :
Max. Text Size: 200
Variable (string) strTmp
Attributes
ID : 45
Scope : local
Text :
Max. Text Size: 2
Variable (string) tId
Attributes
ID : 16
@@ -118,6 +128,50 @@ Variable (int32) ycR
Scope: local
Value: 0
Text m0
Attributes
ID : 46
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 451
y coordinate : 0
Width : 29
Height : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 63488
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(tDate.x==0)
{
tTmp.txt="change model conf to us-l/p "
strlen tTmp.txt,sys1
sya1=sys1*11+m0.h-48/2
for(sys0=0;sys0<sys1;sys0++)
{
substr tTmp.txt,strTmp.txt,sys0,1
xstr m0.x,sys0*-11+m0.y+sya1,30,20,6,WHITE,RED,2,1,3,strTmp.txt
}
}
Text t10
Attributes
ID : 15
@@ -1139,6 +1193,7 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
click m0,1
}
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{

21
HMI/n2t-out/pageTest.txt
View File

@@ -121,20 +121,6 @@ Button b12
Touch Press Event
page cardPower
Button b13
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : insel
Max. Text Size : 10
Events
Touch Press Event
page popupThermo
Button b2
Attributes
Scope : local
@@ -248,6 +234,13 @@ Button b9
Touch Press Event
page popupNotify
Hotspot m0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Timer tmSerial
Attributes
Scope : local

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

@@ -33,12 +33,21 @@ Page screensaver
//page open event
// clear weather elements, to keep example content in HMI
Postinitialize Event
click m0,1
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) strTmp
Attributes
Scope : local
Text :
Max. Text Size: 2
Variable (string) tId
Attributes
Scope : local
@@ -98,6 +107,30 @@ Variable (int32) ycR
Scope: local
Value: 0
Text m0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 10
Events
Touch Press Event
if(tDate.x==0)
{
tTmp.txt="change model conf to us-l/p "
strlen tTmp.txt,sys1
sya1=sys1*11+m0.h-48/2
for(sys0=0;sys0<sys1;sys0++)
{
substr tTmp.txt,strTmp.txt,sys0,1
xstr m0.x,sys0*-11+m0.y+sya1,30,20,6,WHITE,RED,2,1,3,strTmp.txt
}
}
Text t10
Attributes
Scope : local
@@ -567,6 +600,7 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
click m0,1
}
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{