Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

This commit is contained in:
joBr99
2023-05-13 12:59:17 +02:00
5 changed files with 392 additions and 492 deletions

View File

@@ -1355,47 +1355,6 @@
│ Scope : local
│ Period (ms): 50
│ 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/US/portrait/n2t-out/pageStartup.txt
│ @@ -34,20 +34,14 @@

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
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@
@@ -57,13 +57,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +185,26 @@
+e (string) type6
@@ -913,47 +913,6 @@
+ Scope : local
+ Period (ms): 50
+ 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
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +34,14 @@

View File

@@ -1,22 +1,21 @@
Page cardQR
Attributes
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Fill : solid color
Back. Color : 6371
ID : 0
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
Width : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 6371
Events
Preinitialize Event
@@ -153,202 +152,195 @@ Variable (string) vaQR
Text tEntity1
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 82
y coordinate : 295
Width : 163
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 82
y coordinate : 295
Width : 163
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tEntity2
Attributes
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 83
y coordinate : 394
Width : 165
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 83
y coordinate : 394
Width : 165
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tHeading
Attributes
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 66
y coordinate : 26
Width : 184
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 24
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 66
y coordinate : 26
Width : 184
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon1
Attributes
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 294
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 18
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 294
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon2
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 26
y coordinate : 393
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 22
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 26
y coordinate : 393
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 319
Height : 479
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 319
Height : 479
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Button bNext
Attributes
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 16
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 16
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
@@ -367,35 +359,34 @@ Button bNext
Button bPrev
Attributes
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 16
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 16
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
@@ -414,35 +405,34 @@ Button bPrev
Button bText1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 84
y coordinate : 342
Width : 212
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 19
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 84
y coordinate : 342
Width : 212
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
@@ -461,35 +451,34 @@ Button bText1
Button bText2
Attributes
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 80
y coordinate : 439
Width : 213
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 23
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 80
y coordinate : 439
Width : 213
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
@@ -508,31 +497,30 @@ Button bText2
Dual-state Button btOnOff1
Attributes
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 249
y coordinate : 285
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 2
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 249
y coordinate : 285
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
@@ -553,31 +541,30 @@ Dual-state Button btOnOff1
Dual-state Button btOnOff2
Attributes
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 251
y coordinate : 382
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
ID : 20
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 251
y coordinate : 382
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
@@ -598,51 +585,48 @@ Dual-state Button btOnOff2
Hotspot m0
Attributes
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 57
y coordinate : 77
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
ID : 29
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 57
y coordinate : 77
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
Hotspot m1
Attributes
ID : 31
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 57
y coordinate : 144
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
ID : 31
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 57
y coordinate : 144
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
Hotspot mSwipeNext
Attributes
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 310
y coordinate : 5
Width : 8
Height : 475
Effect : load
Effect Priority : 0
Effect Time : 300
ID : 11
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 310
y coordinate : 5
Width : 8
Height : 475
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
@@ -650,19 +634,18 @@ Hotspot mSwipeNext
Hotspot mSwipePrev
Attributes
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 5
Width : 9
Height : 475
Effect : load
Effect Priority : 0
Effect Time : 300
ID : 13
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 0
y coordinate : 5
Width : 9
Height : 475
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
@@ -670,19 +653,18 @@ Hotspot mSwipePrev
Hotspot mSwipeUp
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 0
Width : 295
Height : 10
Effect : load
Effect Priority : 0
Effect Time : 300
ID : 12
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 12
y coordinate : 0
Width : 295
Height : 10
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
@@ -907,11 +889,11 @@ Timer tmSerial
{
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
{
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")
@@ -1057,7 +1039,7 @@ Timer tmSleep
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
tSend.txt="event,sleepReached,cardQR"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -38,6 +38,10 @@ popupShutter
25 Component(s)
398 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
43 Component(s)
496 Line(s) of event code
@@ -62,10 +66,6 @@ cardMedia
59 Component(s)
645 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
46 Component(s)
425 Line(s) of event code
@@ -91,4 +91,4 @@ Total
22 Page(s)
806 Component(s)
9627 Line(s) of event code
2446 Unique line(s) of event code
2447 Unique line(s) of event code

View File

@@ -588,11 +588,11 @@ Timer tmSerial
{
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
{
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")
@@ -737,7 +737,7 @@ Timer tmSleep
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
tSend.txt="event,sleepReached,cardQR"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC