mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-25 17:02:14 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
52ee1de46a
commit
708904863b
@@ -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 @@
|
||||
|
||||
Reference in New Issue
Block a user