From 0c872bfa871a8b20c12fcf68071a3e7c9458e1f9 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 28 Mar 2022 15:49:36 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/cardAlarm.txt | 36 +++++++++++++++++++++++++++++++---- HMI/n2t-out/nspanel_Stats.txt | 12 ++++++------ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index c7a47bfa..e44c02a3 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -838,7 +838,6 @@ Button arm1 Events Touch Press Event - tCode.txt="" // event,buttonPress2,entn,arm1,tCode tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," @@ -855,6 +854,7 @@ Button arm1 prints sys0,2 prints tSend.txt,0 prints crcval,2 + tCode.txt="" Button arm3 Attributes @@ -892,7 +892,6 @@ Button arm3 Events Touch Press Event - tCode.txt="" // event,buttonPress2,entn,arm1,tCode tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," @@ -909,6 +908,7 @@ Button arm3 prints sys0,2 prints tSend.txt,0 prints crcval,2 + tCode.txt="" Button arm2 Attributes @@ -946,7 +946,6 @@ Button arm2 Events Touch Press Event - tCode.txt="" // event,buttonPress2,entn,arm1,tCode tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," @@ -963,6 +962,7 @@ Button arm2 prints sys0,2 prints tSend.txt,0 prints crcval,2 + tCode.txt="" Button arm4 Attributes @@ -1000,7 +1000,6 @@ Button arm4 Events Touch Press Event - tCode.txt="" // event,buttonPress2,entn,arm1,tCode tSend.txt="event,buttonPress2," tSend.txt+=entn.txt+"," @@ -1017,6 +1016,7 @@ Button arm4 prints sys0,2 prints tSend.txt,0 prints crcval,2 + tCode.txt="" Timer tmSerial Attributes @@ -1131,6 +1131,15 @@ Timer tmSerial vis b10,1 vis tCode,1 } + //flashing status + spstr strCommand.txt,tTmp.txt,",",13 + if(tTmp.txt=="enable") + { + tmFlash.en=1 + }else + { + tmFlash.en=0 + } } if(tInstruction.txt=="time") { @@ -1229,6 +1238,25 @@ Timer tmSleep } } +Timer tmFlash + Attributes + ID : 35 + Scope : local + Period (ms): 600 + Enabled : no + + Events + Timer Event + if(tIcon.isbr==1) + { + tIcon.isbr=0 + vis tIcon,0 + }else + { + tIcon.isbr=1 + vis tIcon,1 + } + TouchCap tc0 Attributes ID : 12 diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 53b25494..e46ebdff 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -51,12 +51,12 @@ screensaver 183 Line(s) of event code 133 Unique line(s) of event code cardAlarm - 35 Component(s) - 260 Line(s) of event code - 162 Unique line(s) of event code + 36 Component(s) + 277 Line(s) of event code + 173 Unique line(s) of event code Total 13 Page(s) - 348 Component(s) - 3209 Line(s) of event code - 856 Unique line(s) of event code + 349 Component(s) + 3226 Line(s) of event code + 864 Unique line(s) of event code