From 8f9da7ed72fbed84cd3957a65041e2b97da5c8ae Mon Sep 17 00:00:00 2001 From: joBr99 Date: Thu, 12 Jan 2023 21:12:44 +0000 Subject: [PATCH] add title on cardAlarm (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 333 ++++++++++++++++++++++++++- HMI/US/portrait/diff-eu-version.txt | 333 ++++++++++++++++++++++++++- HMI/US/portrait/diff-filtered.txt | 333 ++++++++++++++++++++++++++- HMI/n2t-out-visual/cardAlarm.txt | 95 ++++++-- HMI/n2t-out-visual/nspanel_Stats.txt | 14 +- HMI/n2t-out/cardAlarm.txt | 75 ++++-- 6 files changed, 1141 insertions(+), 42 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8f6dd242..066e1e65 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,7 +30,338 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -864,18 +864,14 @@ +│ @@ -123,24 +123,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tHeading +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 40 +│ - +│ Text tIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -313,176 +303,154 @@ +│ State : unpressed +│ Text : 1 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"1" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 2 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"2" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b10 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 0 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"0" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b11 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : CLR +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt="" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b2 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 3 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"3" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b3 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 4 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"4" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b4 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 5 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"5" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b5 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 6 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"6" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b6 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 7 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"7" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b7 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 8 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"8" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b8 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 9 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"9" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b9 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ @@ -665,24 +633,15 @@ +│ // write command to variable strCommand +│ ucopy strCommand.txt,4,payloadLength-5,0 +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ if(tInstruction.txt=="entityUpd") +│ { +│ //entn +│ - spstr strCommand.txt,tHeading.txt,"~",1 +│ - if(tHeading.txt!="") +│ - { +│ - vis tCode,0 +│ - vis tHeading,1 +│ - }else +│ - { +│ - vis tCode,1 +│ - vis tHeading,0 +│ - } +│ + spstr strCommand.txt,entn.txt,"~",1 +│ // navigation icon left +│ spstr strCommand.txt,tTmp.txt,"~",2 //type +│ if(tTmp.txt=="delete"||tTmp.txt=="") +│ { +│ vis bPrev,0 +│ }else +│ { +│ @@ -709,56 +668,54 @@ +│ spstr strCommand.txt,bNext.txt,"~",10 +│ // change icon color +│ spstr strCommand.txt,tTmp.txt,"~",11 +│ covx tTmp.txt,sys0,0,0 +│ bNext.pco=sys0 +│ vis bNext,1 +│ } +│ - //entn +│ - spstr strCommand.txt,entn.txt,"~",14 +│ //text arm1 +│ - spstr strCommand.txt,arm1.txt,"~",15 +│ + spstr strCommand.txt,arm1.txt,"~",14 +│ if(arm1.txt!="") +│ { +│ vis arm1,1 +│ } +│ //id arm1 +│ - spstr strCommand.txt,va1.txt,"~",16 +│ + spstr strCommand.txt,va1.txt,"~",15 +│ //text arm2 +│ - spstr strCommand.txt,arm2.txt,"~",17 +│ + spstr strCommand.txt,arm2.txt,"~",16 +│ if(arm2.txt!="") +│ { +│ vis arm2,1 +│ } +│ //id arm2 +│ - spstr strCommand.txt,va2.txt,"~",18 +│ + spstr strCommand.txt,va2.txt,"~",17 +│ //text arm3 +│ - spstr strCommand.txt,arm3.txt,"~",19 +│ + spstr strCommand.txt,arm3.txt,"~",18 +│ if(arm3.txt!="") +│ { +│ vis arm3,1 +│ } +│ //id arm3 +│ - spstr strCommand.txt,va3.txt,"~",20 +│ + spstr strCommand.txt,va3.txt,"~",19 +│ //text arm4 +│ - spstr strCommand.txt,arm4.txt,"~",21 +│ + spstr strCommand.txt,arm4.txt,"~",20 +│ if(arm4.txt!="") +│ { +│ vis arm4,1 +│ } +│ //id arm4 +│ - spstr strCommand.txt,va4.txt,"~",22 +│ + spstr strCommand.txt,va4.txt,"~",21 +│ //icon +│ - spstr strCommand.txt,tIcon.txt,"~",23 +│ + spstr strCommand.txt,tIcon.txt,"~",22 +│ //icon color +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",23 +│ covx tTmp.txt,sys0,0,0 +│ tIcon.pco=sys0 +│ //numpad status +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ if(tTmp.txt!="disable") +│ { +│ vis b0,1 +│ vis b1,1 +│ vis b2,1 +│ vis b3,1 +│ vis b4,1 +│ @@ -783,30 +740,30 @@ +│ vis b8,0 +│ vis b9,0 +│ vis b10,0 +│ vis b11,0 +│ vis tCode,0 +│ } +│ //flashing status +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",25 +│ if(tTmp.txt=="enable") +│ { +│ tmFlash.en=1 +│ }else +│ { +│ tmFlash.en=0 +│ } +│ // extra button +│ - spstr strCommand.txt,b9.txt,"~",27 +│ + spstr strCommand.txt,b9.txt,"~",26 +│ if(b9.txt!="") +│ { +│ vis b9,1 +│ - spstr strCommand.txt,tTmp.txt,"~",28 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,b9.pco,0,0 +│ - spstr strCommand.txt,vaAddBtn.txt,"~",29 +│ + spstr strCommand.txt,vaAddBtn.txt,"~",28 +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ @@ -907,18 +864,14 @@ │ { │ page cardPower │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5f70ef3e..c2515cea 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -32,7 +32,338 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt -│ @@ -864,18 +864,14 @@ +│ @@ -123,24 +123,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tHeading +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 40 +│ - +│ Text tIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -313,176 +303,154 @@ +│ State : unpressed +│ Text : 1 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"1" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 2 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"2" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b10 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 0 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"0" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b11 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : CLR +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt="" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b2 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 3 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"3" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b3 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 4 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"4" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b4 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 5 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"5" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b5 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 6 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"6" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b6 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 7 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"7" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b7 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 8 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"8" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b8 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ Text : 9 +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tCode.txt=tCode.txt+"9" +│ - vis tCode,1 +│ - vis tHeading,0 +│ +│ Button b9 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ @@ -665,24 +633,15 @@ +│ // write command to variable strCommand +│ ucopy strCommand.txt,4,payloadLength-5,0 +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ if(tInstruction.txt=="entityUpd") +│ { +│ //entn +│ - spstr strCommand.txt,tHeading.txt,"~",1 +│ - if(tHeading.txt!="") +│ - { +│ - vis tCode,0 +│ - vis tHeading,1 +│ - }else +│ - { +│ - vis tCode,1 +│ - vis tHeading,0 +│ - } +│ + spstr strCommand.txt,entn.txt,"~",1 +│ // navigation icon left +│ spstr strCommand.txt,tTmp.txt,"~",2 //type +│ if(tTmp.txt=="delete"||tTmp.txt=="") +│ { +│ vis bPrev,0 +│ }else +│ { +│ @@ -709,56 +668,54 @@ +│ spstr strCommand.txt,bNext.txt,"~",10 +│ // change icon color +│ spstr strCommand.txt,tTmp.txt,"~",11 +│ covx tTmp.txt,sys0,0,0 +│ bNext.pco=sys0 +│ vis bNext,1 +│ } +│ - //entn +│ - spstr strCommand.txt,entn.txt,"~",14 +│ //text arm1 +│ - spstr strCommand.txt,arm1.txt,"~",15 +│ + spstr strCommand.txt,arm1.txt,"~",14 +│ if(arm1.txt!="") +│ { +│ vis arm1,1 +│ } +│ //id arm1 +│ - spstr strCommand.txt,va1.txt,"~",16 +│ + spstr strCommand.txt,va1.txt,"~",15 +│ //text arm2 +│ - spstr strCommand.txt,arm2.txt,"~",17 +│ + spstr strCommand.txt,arm2.txt,"~",16 +│ if(arm2.txt!="") +│ { +│ vis arm2,1 +│ } +│ //id arm2 +│ - spstr strCommand.txt,va2.txt,"~",18 +│ + spstr strCommand.txt,va2.txt,"~",17 +│ //text arm3 +│ - spstr strCommand.txt,arm3.txt,"~",19 +│ + spstr strCommand.txt,arm3.txt,"~",18 +│ if(arm3.txt!="") +│ { +│ vis arm3,1 +│ } +│ //id arm3 +│ - spstr strCommand.txt,va3.txt,"~",20 +│ + spstr strCommand.txt,va3.txt,"~",19 +│ //text arm4 +│ - spstr strCommand.txt,arm4.txt,"~",21 +│ + spstr strCommand.txt,arm4.txt,"~",20 +│ if(arm4.txt!="") +│ { +│ vis arm4,1 +│ } +│ //id arm4 +│ - spstr strCommand.txt,va4.txt,"~",22 +│ + spstr strCommand.txt,va4.txt,"~",21 +│ //icon +│ - spstr strCommand.txt,tIcon.txt,"~",23 +│ + spstr strCommand.txt,tIcon.txt,"~",22 +│ //icon color +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",23 +│ covx tTmp.txt,sys0,0,0 +│ tIcon.pco=sys0 +│ //numpad status +│ - spstr strCommand.txt,tTmp.txt,"~",25 +│ + spstr strCommand.txt,tTmp.txt,"~",24 +│ if(tTmp.txt!="disable") +│ { +│ vis b0,1 +│ vis b1,1 +│ vis b2,1 +│ vis b3,1 +│ vis b4,1 +│ @@ -783,30 +740,30 @@ +│ vis b8,0 +│ vis b9,0 +│ vis b10,0 +│ vis b11,0 +│ vis tCode,0 +│ } +│ //flashing status +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",25 +│ if(tTmp.txt=="enable") +│ { +│ tmFlash.en=1 +│ }else +│ { +│ tmFlash.en=0 +│ } +│ // extra button +│ - spstr strCommand.txt,b9.txt,"~",27 +│ + spstr strCommand.txt,b9.txt,"~",26 +│ if(b9.txt!="") +│ { +│ vis b9,1 +│ - spstr strCommand.txt,tTmp.txt,"~",28 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,b9.pco,0,0 +│ - spstr strCommand.txt,vaAddBtn.txt,"~",29 +│ + spstr strCommand.txt,vaAddBtn.txt,"~",28 +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ @@ -907,18 +864,14 @@ │ { │ page cardPower │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 9d9d5a2d..3c9bc16b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-12 17:41:05.442350660 +0000 ++++ /dev/fd/62 2023-01-12 21:12:36.218426206 +0000 +le list + +1,12 @@ +.s.txt @@ -18,6 +18,337 @@ ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardAlarm.txt ++ HMI/US/portrait/n2t-out/cardAlarm.txt ++24 +123,14 @@ ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++eading ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 40 ++ ++con ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++176 +303,154 @@ ++ State : unpressed ++ Text : 1 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"1" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b1 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 2 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"2" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b10 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 0 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"0" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b11 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : CLR ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt="" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b2 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 3 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"3" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b3 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 4 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"4" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b4 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 5 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"5" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b5 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 6 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"6" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 7 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"7" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b7 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 8 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"8" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b8 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : 9 ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tCode.txt=tCode.txt+"9" ++ vis tCode,1 ++ vis tHeading,0 ++ ++b9 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++24 +633,15 @@ ++ // write command to variable strCommand ++ ucopy strCommand.txt,4,payloadLength-5,0 ++ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) ++ spstr strCommand.txt,tInstruction.txt,"~",0 ++ if(tInstruction.txt=="entityUpd") ++ { ++ //entn ++ spstr strCommand.txt,tHeading.txt,"~",1 ++ if(tHeading.txt!="") ++ { ++ vis tCode,0 ++ vis tHeading,1 ++ }else ++ { ++ vis tCode,1 ++ vis tHeading,0 ++ } ++ spstr strCommand.txt,entn.txt,"~",1 ++ // navigation icon left ++ spstr strCommand.txt,tTmp.txt,"~",2 //type ++ if(tTmp.txt=="delete"||tTmp.txt=="") ++ { ++ vis bPrev,0 ++ }else ++ { ++56 +668,54 @@ ++ spstr strCommand.txt,bNext.txt,"~",10 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ bNext.pco=sys0 ++ vis bNext,1 ++ } ++ //entn ++ spstr strCommand.txt,entn.txt,"~",14 ++ //text arm1 ++ spstr strCommand.txt,arm1.txt,"~",15 ++ spstr strCommand.txt,arm1.txt,"~",14 ++ if(arm1.txt!="") ++ { ++ vis arm1,1 ++ } ++ //id arm1 ++ spstr strCommand.txt,va1.txt,"~",16 ++ spstr strCommand.txt,va1.txt,"~",15 ++ //text arm2 ++ spstr strCommand.txt,arm2.txt,"~",17 ++ spstr strCommand.txt,arm2.txt,"~",16 ++ if(arm2.txt!="") ++ { ++ vis arm2,1 ++ } ++ //id arm2 ++ spstr strCommand.txt,va2.txt,"~",18 ++ spstr strCommand.txt,va2.txt,"~",17 ++ //text arm3 ++ spstr strCommand.txt,arm3.txt,"~",19 ++ spstr strCommand.txt,arm3.txt,"~",18 ++ if(arm3.txt!="") ++ { ++ vis arm3,1 ++ } ++ //id arm3 ++ spstr strCommand.txt,va3.txt,"~",20 ++ spstr strCommand.txt,va3.txt,"~",19 ++ //text arm4 ++ spstr strCommand.txt,arm4.txt,"~",21 ++ spstr strCommand.txt,arm4.txt,"~",20 ++ if(arm4.txt!="") ++ { ++ vis arm4,1 ++ } ++ //id arm4 ++ spstr strCommand.txt,va4.txt,"~",22 ++ spstr strCommand.txt,va4.txt,"~",21 ++ //icon ++ spstr strCommand.txt,tIcon.txt,"~",23 ++ spstr strCommand.txt,tIcon.txt,"~",22 ++ //icon color ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ covx tTmp.txt,sys0,0,0 ++ tIcon.pco=sys0 ++ //numpad status ++ spstr strCommand.txt,tTmp.txt,"~",25 ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ if(tTmp.txt!="disable") ++ { ++ vis b0,1 ++ vis b1,1 ++ vis b2,1 ++ vis b3,1 ++ vis b4,1 ++30 +740,30 @@ ++ vis b8,0 ++ vis b9,0 ++ vis b10,0 ++ vis b11,0 ++ vis tCode,0 ++ } ++ //flashing status ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ spstr strCommand.txt,tTmp.txt,"~",25 ++ if(tTmp.txt=="enable") ++ { ++ tmFlash.en=1 ++ }else ++ { ++ tmFlash.en=0 ++ } ++ // extra button ++ spstr strCommand.txt,b9.txt,"~",27 ++ spstr strCommand.txt,b9.txt,"~",26 ++ if(b9.txt!="") ++ { ++ vis b9,1 ++ spstr strCommand.txt,tTmp.txt,"~",28 ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ covx tTmp.txt,b9.pco,0,0 ++ spstr strCommand.txt,vaAddBtn.txt,"~",29 ++ spstr strCommand.txt,vaAddBtn.txt,"~",28 ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } +18 +864,14 @@ + { + page cardPower diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index e0a16bb9..be10d416 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -165,6 +165,36 @@ Text tCode Horizontal Spacing : 0 Vertical Spacing : 0 +Text tHeading + Attributes + ID : 42 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 65 + y coordinate : 24 + Width : 227 + 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 tIcon Attributes ID : 26 @@ -555,6 +585,8 @@ Button b0 Events Touch Press Event tCode.txt=tCode.txt+"1" + vis tCode,1 + vis tHeading,0 Button b1 Attributes @@ -593,6 +625,8 @@ Button b1 Events Touch Press Event tCode.txt=tCode.txt+"2" + vis tCode,1 + vis tHeading,0 Button b10 Attributes @@ -631,6 +665,8 @@ Button b10 Events Touch Press Event tCode.txt=tCode.txt+"0" + vis tCode,1 + vis tHeading,0 Button b11 Attributes @@ -669,6 +705,8 @@ Button b11 Events Touch Press Event tCode.txt="" + vis tCode,1 + vis tHeading,0 Button b2 Attributes @@ -707,6 +745,8 @@ Button b2 Events Touch Press Event tCode.txt=tCode.txt+"3" + vis tCode,1 + vis tHeading,0 Button b3 Attributes @@ -745,6 +785,8 @@ Button b3 Events Touch Press Event tCode.txt=tCode.txt+"4" + vis tCode,1 + vis tHeading,0 Button b4 Attributes @@ -783,6 +825,8 @@ Button b4 Events Touch Press Event tCode.txt=tCode.txt+"5" + vis tCode,1 + vis tHeading,0 Button b5 Attributes @@ -821,6 +865,8 @@ Button b5 Events Touch Press Event tCode.txt=tCode.txt+"6" + vis tCode,1 + vis tHeading,0 Button b6 Attributes @@ -859,6 +905,8 @@ Button b6 Events Touch Press Event tCode.txt=tCode.txt+"7" + vis tCode,1 + vis tHeading,0 Button b7 Attributes @@ -897,6 +945,8 @@ Button b7 Events Touch Press Event tCode.txt=tCode.txt+"8" + vis tCode,1 + vis tHeading,0 Button b8 Attributes @@ -935,6 +985,8 @@ Button b8 Events Touch Press Event tCode.txt=tCode.txt+"9" + vis tCode,1 + vis tHeading,0 Button b9 Attributes @@ -1222,7 +1274,16 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,"~",1 + spstr strCommand.txt,tHeading.txt,"~",1 + if(tHeading.txt!="") + { + vis tCode,0 + vis tHeading,1 + }else + { + vis tCode,1 + vis tHeading,0 + } // navigation icon left spstr strCommand.txt,tTmp.txt,"~",2 //type if(tTmp.txt=="delete"||tTmp.txt=="") @@ -1257,46 +1318,48 @@ Timer tmSerial bNext.pco=sys0 vis bNext,1 } + //entn + spstr strCommand.txt,entn.txt,"~",14 //text arm1 - spstr strCommand.txt,arm1.txt,"~",14 + spstr strCommand.txt,arm1.txt,"~",15 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",15 + spstr strCommand.txt,va1.txt,"~",16 //text arm2 - spstr strCommand.txt,arm2.txt,"~",16 + spstr strCommand.txt,arm2.txt,"~",17 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",17 + spstr strCommand.txt,va2.txt,"~",18 //text arm3 - spstr strCommand.txt,arm3.txt,"~",18 + spstr strCommand.txt,arm3.txt,"~",19 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",19 + spstr strCommand.txt,va3.txt,"~",20 //text arm4 - spstr strCommand.txt,arm4.txt,"~",20 + spstr strCommand.txt,arm4.txt,"~",21 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",21 + spstr strCommand.txt,va4.txt,"~",22 //icon - spstr strCommand.txt,tIcon.txt,"~",22 + spstr strCommand.txt,tIcon.txt,"~",23 //icon color - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",25 if(tTmp.txt!="disable") { vis b0,1 @@ -1329,7 +1392,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",26 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -1338,13 +1401,13 @@ Timer tmSerial tmFlash.en=0 } // extra button - spstr strCommand.txt,b9.txt,"~",26 + spstr strCommand.txt,b9.txt,"~",27 if(b9.txt!="") { vis b9,1 - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,b9.pco,0,0 - spstr strCommand.txt,vaAddBtn.txt,"~",28 + spstr strCommand.txt,vaAddBtn.txt,"~",29 } } if(tInstruction.txt=="time") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 41953250..cf6a973e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -30,6 +30,10 @@ pageTest 26 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code +cardAlarm + 43 Component(s) + 451 Line(s) of event code + 261 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -62,10 +66,6 @@ cardMedia 59 Component(s) 641 Line(s) of event code 318 Unique line(s) of event code -cardAlarm - 42 Component(s) - 419 Line(s) of event code - 255 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code @@ -85,6 +85,6 @@ cardEntities Total 20 Page(s) - 733 Component(s) - 8695 Line(s) of event code - 2223 Unique line(s) of event code + 734 Component(s) + 8727 Line(s) of event code + 2230 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index cc399492..94b9e51c 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -127,6 +127,16 @@ Text tCode Text : Max. Text Size : 10 +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + Text tIcon Attributes Scope : local @@ -307,6 +317,8 @@ Button b0 Events Touch Press Event tCode.txt=tCode.txt+"1" + vis tCode,1 + vis tHeading,0 Button b1 Attributes @@ -321,6 +333,8 @@ Button b1 Events Touch Press Event tCode.txt=tCode.txt+"2" + vis tCode,1 + vis tHeading,0 Button b10 Attributes @@ -335,6 +349,8 @@ Button b10 Events Touch Press Event tCode.txt=tCode.txt+"0" + vis tCode,1 + vis tHeading,0 Button b11 Attributes @@ -349,6 +365,8 @@ Button b11 Events Touch Press Event tCode.txt="" + vis tCode,1 + vis tHeading,0 Button b2 Attributes @@ -363,6 +381,8 @@ Button b2 Events Touch Press Event tCode.txt=tCode.txt+"3" + vis tCode,1 + vis tHeading,0 Button b3 Attributes @@ -377,6 +397,8 @@ Button b3 Events Touch Press Event tCode.txt=tCode.txt+"4" + vis tCode,1 + vis tHeading,0 Button b4 Attributes @@ -391,6 +413,8 @@ Button b4 Events Touch Press Event tCode.txt=tCode.txt+"5" + vis tCode,1 + vis tHeading,0 Button b5 Attributes @@ -405,6 +429,8 @@ Button b5 Events Touch Press Event tCode.txt=tCode.txt+"6" + vis tCode,1 + vis tHeading,0 Button b6 Attributes @@ -419,6 +445,8 @@ Button b6 Events Touch Press Event tCode.txt=tCode.txt+"7" + vis tCode,1 + vis tHeading,0 Button b7 Attributes @@ -433,6 +461,8 @@ Button b7 Events Touch Press Event tCode.txt=tCode.txt+"8" + vis tCode,1 + vis tHeading,0 Button b8 Attributes @@ -447,6 +477,8 @@ Button b8 Events Touch Press Event tCode.txt=tCode.txt+"9" + vis tCode,1 + vis tHeading,0 Button b9 Attributes @@ -637,7 +669,16 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,"~",1 + spstr strCommand.txt,tHeading.txt,"~",1 + if(tHeading.txt!="") + { + vis tCode,0 + vis tHeading,1 + }else + { + vis tCode,1 + vis tHeading,0 + } // navigation icon left spstr strCommand.txt,tTmp.txt,"~",2 //type if(tTmp.txt=="delete"||tTmp.txt=="") @@ -672,46 +713,48 @@ Timer tmSerial bNext.pco=sys0 vis bNext,1 } + //entn + spstr strCommand.txt,entn.txt,"~",14 //text arm1 - spstr strCommand.txt,arm1.txt,"~",14 + spstr strCommand.txt,arm1.txt,"~",15 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",15 + spstr strCommand.txt,va1.txt,"~",16 //text arm2 - spstr strCommand.txt,arm2.txt,"~",16 + spstr strCommand.txt,arm2.txt,"~",17 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",17 + spstr strCommand.txt,va2.txt,"~",18 //text arm3 - spstr strCommand.txt,arm3.txt,"~",18 + spstr strCommand.txt,arm3.txt,"~",19 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",19 + spstr strCommand.txt,va3.txt,"~",20 //text arm4 - spstr strCommand.txt,arm4.txt,"~",20 + spstr strCommand.txt,arm4.txt,"~",21 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",21 + spstr strCommand.txt,va4.txt,"~",22 //icon - spstr strCommand.txt,tIcon.txt,"~",22 + spstr strCommand.txt,tIcon.txt,"~",23 //icon color - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",25 if(tTmp.txt!="disable") { vis b0,1 @@ -744,7 +787,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",26 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -753,13 +796,13 @@ Timer tmSerial tmFlash.en=0 } // extra button - spstr strCommand.txt,b9.txt,"~",26 + spstr strCommand.txt,b9.txt,"~",27 if(b9.txt!="") { vis b9,1 - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,b9.pco,0,0 - spstr strCommand.txt,vaAddBtn.txt,"~",28 + spstr strCommand.txt,vaAddBtn.txt,"~",29 } } if(tInstruction.txt=="time")