h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-26 19:02:15 +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
2023-05-13 10:11:26 +00:00
committed by github-actions[bot]
parent 52ee1de46a
commit 708904863b
5 changed files with 392 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1355,47 +1355,6 @@
│ Scope : local │ Scope : local
│ Period (ms): 50 │ Period (ms): 50
│ Enabled : yes │ Enabled : yes
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -584,19 +584,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
│ + qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
│ + qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -733,15 +733,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
│ sleepValue+=1
│ if(sleepTimeout<=sleepValue)
│ {
│ sleepValue=0
│ dim=dimValue
│ - tSend.txt="event,sleepReached,cardQR"
│ + tSend.txt="event,sleepReached,cardAlarm"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -34,20 +34,14 @@ │ @@ -34,20 +34,14 @@

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-05-13 09:27:24.610159768 +0000 +++ /dev/fd/62 2023-05-13 10:11:16.737208392 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@ +1 +10,11 @@
@@ -57,13 +57,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +185,26 @@ +14 +185,26 @@
+e (string) type6 +e (string) type6
@@ -913,47 +913,6 @@
+ Scope : local + Scope : local
+ Period (ms): 50 + Period (ms): 50
+ Enabled : yes + Enabled : yes
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+19 +584,19 @@
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",26
+ }
+ if(type2.txt=="delete"||type2.txt=="")
+ {
+ if(type1.txt=="delete"||type1.txt=="")
+ {
+ qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
+ qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
+ }
+ }else
+ {
+ qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
+ qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+15 +733,15 @@
+ if(sleepTimeout!=0&&dimValue!=dim)
+ {
+ sleepValue+=1
+ if(sleepTimeout<=sleepValue)
+ {
+ sleepValue=0
+ dim=dimValue
+ tSend.txt="event,sleepReached,cardQR"
+ tSend.txt="event,sleepReached,cardAlarm"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +34,14 @@ +0 +34,14 @@

60
HMI/US/portrait/n2t-out-visual/cardQR.txt
View File

@@ -3,7 +3,6 @@ Page cardQR
ID : 0 ID : 0
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
Width : 320 Width : 320
@@ -14,7 +13,7 @@ Page cardQR
Swide up page ID : disabled Swide up page ID : disabled
Swide down page ID : disabled Swide down page ID : disabled
Swide left page ID : disabled Swide left page ID : disabled
Swide right page ID : disabled Swide right page ID: disabled
Fill : solid color Fill : solid color
Back. Color : 6371 Back. Color : 6371
@@ -156,7 +155,6 @@ Text tEntity1
ID : 17 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 82 x coordinate : 82
@@ -172,7 +170,7 @@ Text tEntity1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : left Horizontal Alignment: left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : tEntity1 Text : tEntity1
@@ -186,7 +184,6 @@ Text tEntity2
ID : 21 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 83 x coordinate : 83
@@ -202,7 +199,7 @@ Text tEntity2
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : left Horizontal Alignment: left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : tEntity1 Text : tEntity1
@@ -216,7 +213,6 @@ Text tHeading
ID : 24 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 66 x coordinate : 66
@@ -232,7 +228,7 @@ Text tHeading
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
@@ -246,7 +242,6 @@ Text tIcon1
ID : 18 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 25 x coordinate : 25
@@ -262,7 +257,7 @@ Text tIcon1
Font ID : 1 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Font Color : 17299 Font Color : 17299
Horizontal Alignment : center Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
@@ -276,7 +271,6 @@ Text tIcon2
ID : 22 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 26 x coordinate : 26
@@ -292,7 +286,7 @@ Text tIcon2
Font ID : 1 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Font Color : 17299 Font Color : 17299
Horizontal Alignment : center Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text :  Text : 
@@ -306,8 +300,7 @@ Picture p0
ID : 1 ID : 1
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 0 y coordinate : 0
@@ -323,7 +316,6 @@ Button bNext
ID : 3 ID : 3
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 262 x coordinate : 262
@@ -337,7 +329,7 @@ Button bNext
Style : flat Style : flat
Font ID : 3 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -370,7 +362,6 @@ Button bPrev
ID : 4 ID : 4
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 9 x coordinate : 9
@@ -384,7 +375,7 @@ Button bPrev
Style : flat Style : flat
Font ID : 3 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -417,7 +408,6 @@ Button bText1
ID : 19 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 84 x coordinate : 84
@@ -431,7 +421,7 @@ Button bText1
Style : flat Style : flat
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -464,7 +454,6 @@ Button bText2
ID : 23 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 80 x coordinate : 80
@@ -478,7 +467,7 @@ Button bText2
Style : flat Style : flat
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -511,7 +500,6 @@ Dual-state Button btOnOff1
ID : 2 ID : 2
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 249 x coordinate : 249
@@ -523,7 +511,7 @@ Dual-state Button btOnOff1
Effect Time : 300 Effect Time : 300
Fill : image Fill : image
Font ID : 0 Font ID : 0
Background Picture ID (Unpressed) : 1 Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2 Back. Picture ID (Pressed) : 2
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
@@ -556,7 +544,6 @@ Dual-state Button btOnOff2
ID : 20 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 251 x coordinate : 251
@@ -568,7 +555,7 @@ Dual-state Button btOnOff2
Effect Time : 300 Effect Time : 300
Fill : image Fill : image
Font ID : 0 Font ID : 0
Background Picture ID (Unpressed) : 1 Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2 Back. Picture ID (Pressed) : 2
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
@@ -601,8 +588,7 @@ Hotspot m0
ID : 29 ID : 29
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 57 x coordinate : 57
y coordinate : 77 y coordinate : 77
@@ -617,8 +603,7 @@ Hotspot m1
ID : 31 ID : 31
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 57 x coordinate : 57
y coordinate : 144 y coordinate : 144
@@ -633,8 +618,7 @@ Hotspot mSwipeNext
ID : 11 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 310 x coordinate : 310
y coordinate : 5 y coordinate : 5
@@ -653,8 +637,7 @@ Hotspot mSwipePrev
ID : 13 ID : 13
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 5 y coordinate : 5
@@ -673,8 +656,7 @@ Hotspot mSwipeUp
ID : 12 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Send Component ID: disabled
Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 0 y coordinate : 0
@@ -907,11 +889,11 @@ Timer tmSerial
{ {
if(type1.txt=="delete"||type1.txt=="") if(type1.txt=="delete"||type1.txt=="")
{ {
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
}else }else
{ {
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
@@ -1057,7 +1039,7 @@ Timer tmSleep
{ {
sleepValue=0 sleepValue=0
dim=dimValue dim=dimValue
tSend.txt="event,sleepReached,cardAlarm" tSend.txt="event,sleepReached,cardQR"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

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

@@ -38,6 +38,10 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
cardAlarm cardAlarm
43 Component(s) 43 Component(s)
496 Line(s) of event code 496 Line(s) of event code
@@ -62,10 +66,6 @@ cardMedia
59 Component(s) 59 Component(s)
645 Line(s) of event code 645 Line(s) of event code
320 Unique line(s) of event code 320 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
screensaver screensaver
46 Component(s) 46 Component(s)
425 Line(s) of event code 425 Line(s) of event code
@@ -91,4 +91,4 @@ Total
22 Page(s) 22 Page(s)
806 Component(s) 806 Component(s)
9627 Line(s) of event code 9627 Line(s) of event code
2446 Unique line(s) of event code 2447 Unique line(s) of event code

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

@@ -588,11 +588,11 @@ Timer tmSerial
{ {
if(type1.txt=="delete"||type1.txt=="") if(type1.txt=="delete"||type1.txt=="")
{ {
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
}else }else
{ {
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
@@ -737,7 +737,7 @@ Timer tmSleep
{ {
sleepValue=0 sleepValue=0
dim=dimValue dim=dimValue
tSend.txt="event,sleepReached,cardAlarm" tSend.txt="event,sleepReached,cardQR"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC