From dc5896c5050f814e8fdb2d1d156a08da2d2b99d4 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 30 May 2022 20:14:02 +0000 Subject: [PATCH] syned alarm page to us-l and us-p #242 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 249 ++---------------- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 230 ++++++++++------ .../landscape/n2t-out-visual/cardEntities.txt | 1 + HMI/US/landscape/n2t-out-visual/cardGrid.txt | 2 +- HMI/US/landscape/n2t-out-visual/cardMedia.txt | 1 + HMI/US/landscape/n2t-out-visual/cardQR.txt | 1 + .../landscape/n2t-out-visual/cardThermo.txt | 1 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 66 ++--- .../landscape/n2t-out-visual/popupLight.txt | 1 + .../landscape/n2t-out-visual/popupNotify.txt | 1 + .../landscape/n2t-out-visual/popupShutter.txt | 1 + HMI/US/landscape/n2t-out/cardAlarm.txt | 59 ++++- HMI/US/landscape/n2t-out/cardEntities.txt | 1 + HMI/US/landscape/n2t-out/cardGrid.txt | 2 +- HMI/US/landscape/n2t-out/cardMedia.txt | 1 + HMI/US/landscape/n2t-out/cardQR.txt | 1 + HMI/US/landscape/n2t-out/cardThermo.txt | 1 + HMI/US/landscape/n2t-out/popupLight.txt | 1 + HMI/US/landscape/n2t-out/popupNotify.txt | 1 + HMI/US/landscape/n2t-out/popupShutter.txt | 1 + HMI/US/portrait/diff-eu-version.txt | 119 +-------- HMI/US/portrait/diff-filtered.txt | 121 +-------- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 147 ++++++++--- .../n2t-out-visual/nspanel_US_P_Stats.txt | 12 +- HMI/US/portrait/n2t-out/cardAlarm.txt | 52 +++- 25 files changed, 471 insertions(+), 602 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 65796ae4..8cff6894 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 19:51:39.990229715 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 20:13:57.965045854 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,144 +8,10 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - vis p0,0 - vis tSend,0 - vis tInstruction,0 -@@ -33,7 +32,6 @@ - vis b8,0 - vis b9,0 - vis b10,0 -- vis b11,0 - vis tCode,0 - vis bPrev,0 - vis bNext,0 -@@ -80,12 +78,6 @@ - Text : - Max. Text Size: 20 - --Variable (string) vaAddBtn -- Attributes -- Scope : local -- Text : -- Max. Text Size: 20 -- - Text tTmp - Attributes - Scope : local -@@ -333,27 +325,12 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -+ Text : 0 - Max. Text Size : 10 - - Events - Touch Press Event -- // event,buttonPress2,entn,arm1,tCode -- tSend.txt="event,buttonPress2," -- tSend.txt+=entn.txt+"," -- tSend.txt+=vaAddBtn.txt -- //send calc crc -- btlen tSend.txt,sys0 -- crcrest 1,0xffff // reset CRC -- crcputh 55 bb -- crcputs sys0,2 -- crcputs tSend.txt,0 -- //send cmd -- printh 55 bb -- prints sys0,2 -- prints tSend.txt,0 -- prints crcval,2 -- tCode.txt="" -+ tCode.txt=tCode.txt+"0" - - Button b10 - Attributes -@@ -362,12 +339,12 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : 0 -+ Text : CLR - Max. Text Size : 10 - - Events - Touch Press Event -- tCode.txt=tCode.txt+"0" -+ tCode.txt="" - - Button arm1 - Attributes -@@ -489,20 +466,6 @@ - prints crcval,2 - tCode.txt="" - --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="" -- - Hotspot mSwipeNext - Attributes - Scope : local -@@ -704,15 +667,6 @@ - { - tmFlash.en=0 - } -- // extra button -- spstr strCommand.txt,b9.txt,"~",15 -- if(b9.txt!="") -- { -- vis b9,1 -- spstr strCommand.txt,tTmp.txt,"~",16 -- covx tTmp.txt,b9.pco,0,0 -- spstr strCommand.txt,vaAddBtn.txt,"~",17 -- } - } - if(tInstruction.txt=="time") - { -@@ -729,10 +683,7 @@ - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 -- // get value normal -- spstr strCommand.txt,tTmp.txt,"~",2 -- covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal -+ dim=dimValue - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - //wup=cardEntities - //remove background & activate reparse mode - vis p0,0 -@@ -1925,10 +1924,6 @@ +--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 20:13:57.969045903 +0000 +@@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -157,17 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,7 @@ - - Events - Preinitialize Event -- dim=dimValueNormal -+ //wup=cardEntities - //remove background & activate reparse mode - vis p0,0 - recmod=1 +--- HMI/n2t-out/cardGrid.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 20:13:57.965045854 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -180,17 +37,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - vis p0,0 - vis tSend,0 - vis tInstruction,0 -@@ -636,10 +635,7 @@ +--- HMI/n2t-out/cardMedia.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 20:13:57.965045854 +0000 +@@ -636,10 +636,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -203,17 +52,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - vis p0,0 - vis tSend,0 - vis tInstruction,0 -@@ -582,10 +581,7 @@ +--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 20:13:57.965045854 +0000 +@@ -582,10 +582,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -226,17 +67,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - vis p0,0 - vis tSend,0 - vis tInstruction,0 -@@ -1170,10 +1169,6 @@ +--- HMI/n2t-out/cardThermo.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 20:13:57.969045903 +0000 +@@ -1170,10 +1170,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -248,8 +81,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 19:51:39.990229715 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 20:13:57.965045854 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -271,17 +104,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - //get entitiy name - tEntity.txt=pageIcons.tTmp1.txt - //get entity id -@@ -561,10 +560,6 @@ +--- HMI/n2t-out/popupLight.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 20:13:57.965045854 +0000 +@@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -293,17 +118,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - vis p0,0 - vis tSend,0 - vis tTmp,0 -@@ -311,10 +310,6 @@ +--- HMI/n2t-out/popupNotify.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 20:13:57.965045854 +0000 +@@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -315,17 +132,9 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 19:51:39.990229715 +0000 -@@ -12,7 +12,6 @@ - - Events - Preinitialize Event -- dim=dimValueNormal - //get entitiy name - tEntity.txt=pageIcons.tTmp1.txt - //get entity id -@@ -406,10 +405,6 @@ +--- HMI/n2t-out/popupShutter.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 20:13:57.969045903 +0000 +@@ -406,10 +406,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -337,8 +146,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 19:51:39.990229715 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 20:13:57.969045903 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 84e52341..7c04df0a 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -20,6 +20,7 @@ Page cardAlarm Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 @@ -40,6 +41,7 @@ Page cardAlarm vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 vis bPrev,0 vis bNext,0 @@ -93,6 +95,13 @@ Variable (string) va4 Text : Max. Text Size: 20 +Variable (string) vaAddBtn + Attributes + ID : 39 + Scope : local + Text : + Max. Text Size: 20 + Text tTmp Attributes ID : 2 @@ -111,7 +120,7 @@ Text tTmp Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 6 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -141,7 +150,7 @@ Text tInstruction Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 6 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -171,7 +180,7 @@ Text tId Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 6 Back. Color : 65535 Font Color : 0 Horizontal Alignment : center @@ -191,7 +200,7 @@ Text tCode Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 107 + x coordinate : 108 y coordinate : 16 Width : 192 Height : 49 @@ -201,7 +210,7 @@ Text tCode Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 10565 Font Color : 40179 Horizontal Alignment : center @@ -221,7 +230,7 @@ Text tIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 315 + x coordinate : 316 y coordinate : 16 Width : 64 Height : 49 @@ -253,8 +262,8 @@ Picture p0 Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 480 - Height : 320 + Width : 479 + Height : 319 Effect : load Effect Priority : 0 Effect Time : 300 @@ -268,7 +277,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 407 y coordinate : 16 Width : 50 Height : 50 @@ -315,7 +324,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 25 y coordinate : 16 Width : 50 Height : 50 @@ -369,7 +378,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 94 Width : 75 Height : 50 @@ -380,7 +389,7 @@ Button b0 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -407,7 +416,7 @@ Button b1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 132 + x coordinate : 133 y coordinate : 94 Width : 75 Height : 50 @@ -418,7 +427,7 @@ Button b1 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -445,7 +454,7 @@ Button b2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 224 + x coordinate : 225 y coordinate : 93 Width : 75 Height : 50 @@ -456,7 +465,7 @@ Button b2 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -483,7 +492,7 @@ Button b3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 152 Width : 75 Height : 50 @@ -494,7 +503,7 @@ Button b3 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -521,7 +530,7 @@ Button b4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 132 + x coordinate : 133 y coordinate : 152 Width : 75 Height : 50 @@ -532,7 +541,7 @@ Button b4 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -559,7 +568,7 @@ Button b5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 224 + x coordinate : 225 y coordinate : 152 Width : 75 Height : 50 @@ -570,7 +579,7 @@ Button b5 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -597,7 +606,7 @@ Button b6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 40 + x coordinate : 41 y coordinate : 210 Width : 75 Height : 50 @@ -608,7 +617,7 @@ Button b6 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -635,7 +644,7 @@ Button b7 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 132 + x coordinate : 133 y coordinate : 210 Width : 75 Height : 50 @@ -646,7 +655,7 @@ Button b7 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -673,7 +682,7 @@ Button b8 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 224 + x coordinate : 225 y coordinate : 210 Width : 75 Height : 50 @@ -684,7 +693,7 @@ Button b8 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -711,7 +720,7 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 131 + x coordinate : 41 y coordinate : 266 Width : 75 Height : 50 @@ -722,7 +731,60 @@ Button b9 Style : border Border Color : 6371 Border Width : 2 - Font ID : 2 + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + 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 + // event,buttonPress2,entn,arm1,tCode + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+=vaAddBtn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + tCode.txt="" + +Button b10 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 134 + y coordinate : 266 + Width : 75 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Border Color : 6371 + Border Width : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -741,44 +803,6 @@ Button b9 Touch Press Event tCode.txt=tCode.txt+"0" -Button b10 - Attributes - ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 224 - y coordinate : 266 - Width : 75 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : border - Border Color : 6371 - Border Width : 2 - Font ID : 2 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 1374 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : CLR - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - tCode.txt="" - Button arm1 Attributes ID : 24 @@ -787,7 +811,7 @@ Button arm1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 315 + x coordinate : 316 y coordinate : 91 Width : 141 Height : 50 @@ -798,7 +822,7 @@ Button arm1 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 6 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -841,7 +865,7 @@ Button arm3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 315 + x coordinate : 316 y coordinate : 210 Width : 140 Height : 50 @@ -852,7 +876,7 @@ Button arm3 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 6 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -895,7 +919,7 @@ Button arm2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 315 + x coordinate : 316 y coordinate : 152 Width : 141 Height : 50 @@ -906,7 +930,7 @@ Button arm2 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 6 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -949,7 +973,7 @@ Button arm4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 315 + x coordinate : 316 y coordinate : 266 Width : 141 Height : 50 @@ -960,7 +984,7 @@ Button arm4 Style : border Border Color : 6371 Border Width : 2 - Font ID : 0 + Font ID : 6 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -995,6 +1019,44 @@ Button arm4 prints crcval,2 tCode.txt="" +Button b11 + Attributes + ID : 38 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 225 + y coordinate : 266 + Width : 75 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Border Color : 6371 + Border Width : 2 + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : CLR + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tCode.txt="" + Hotspot mSwipeNext Attributes ID : 35 @@ -1025,7 +1087,7 @@ Hotspot mSwipeUp Opacity : 127 x coordinate : 12 y coordinate : 0 - Width : 450 + Width : 426 Height : 9 Effect : load Effect Priority : 0 @@ -1224,6 +1286,15 @@ Timer tmSerial { tmFlash.en=0 } + // extra button + spstr strCommand.txt,b9.txt,"~",15 + if(b9.txt!="") + { + vis b9,1 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,b9.pco,0,0 + spstr strCommand.txt,vaAddBtn.txt,"~",17 + } } if(tInstruction.txt=="time") { @@ -1240,7 +1311,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 28d83f18..7017b242 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -20,6 +20,7 @@ Page cardEntities Events Preinitialize Event + dim=dimValueNormal //wup=cardEntities //remove background & activate reparse mode vis p0,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 537c73a9..ae6b8c9c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -20,7 +20,7 @@ Page cardGrid Events Preinitialize Event - //wup=cardEntities + dim=dimValueNormal //remove background & activate reparse mode vis p0,0 recmod=1 diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 15083a7c..643fa04b 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -20,6 +20,7 @@ Page cardMedia Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 6f11a74b..05112b77 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -20,6 +20,7 @@ Page cardQR Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 5cdaea0c..2c49011a 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -20,6 +20,7 @@ Page cardThermo Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index a06ec260..794a19f1 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -12,51 +12,51 @@ pageTest 14 Unique line(s) of event code popupNotify 17 Component(s) - 200 Line(s) of event code - 125 Unique line(s) of event code + 201 Line(s) of event code + 126 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code -cardThermo - 56 Component(s) - 542 Line(s) of event code - 292 Unique line(s) of event code -popupShutter - 20 Component(s) - 244 Line(s) of event code - 138 Unique line(s) of event code -cardQR - 30 Component(s) - 359 Line(s) of event code - 209 Unique line(s) of event code popupLight 27 Component(s) - 348 Line(s) of event code - 188 Unique line(s) of event code -cardGrid - 42 Component(s) - 435 Line(s) of event code - 256 Unique line(s) of event code -cardAlarm - 38 Component(s) - 360 Line(s) of event code - 226 Unique line(s) of event code + 349 Line(s) of event code + 189 Unique line(s) of event code cardMedia 33 Component(s) - 346 Line(s) of event code - 181 Unique line(s) of event code + 347 Line(s) of event code + 182 Unique line(s) of event code +cardQR + 30 Component(s) + 360 Line(s) of event code + 210 Unique line(s) of event code +cardGrid + 42 Component(s) + 436 Line(s) of event code + 257 Unique line(s) of event code +popupShutter + 20 Component(s) + 245 Line(s) of event code + 139 Unique line(s) of event code +cardThermo + 56 Component(s) + 543 Line(s) of event code + 293 Unique line(s) of event code +cardAlarm + 40 Component(s) + 385 Line(s) of event code + 235 Unique line(s) of event code +cardEntities + 65 Component(s) + 1130 Line(s) of event code + 494 Unique line(s) of event code screensaver 37 Component(s) 305 Line(s) of event code 244 Unique line(s) of event code -cardEntities - 65 Component(s) - 1129 Line(s) of event code - 493 Unique line(s) of event code Total 13 Page(s) - 404 Component(s) - 4446 Line(s) of event code - 1177 Unique line(s) of event code + 406 Component(s) + 4479 Line(s) of event code + 1185 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 386a4486..21a412ee 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -20,6 +20,7 @@ Page popupLight Events Preinitialize Event + dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt //get entity id diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index 0f1aee02..17afe255 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -20,6 +20,7 @@ Page popupNotify Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tTmp,0 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index ea376ba8..53f83203 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -20,6 +20,7 @@ Page popupShutter Events Preinitialize Event + dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt //get entity id diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 3b44119a..57f6e110 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -12,6 +12,7 @@ Page cardAlarm Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 @@ -32,6 +33,7 @@ Page cardAlarm vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 vis bPrev,0 vis bNext,0 @@ -78,6 +80,12 @@ Variable (string) va4 Text : Max. Text Size: 20 +Variable (string) vaAddBtn + Attributes + Scope : local + Text : + Max. Text Size: 20 + Text tTmp Attributes Scope : local @@ -325,12 +333,27 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : 0 + Text : Max. Text Size : 10 Events Touch Press Event - tCode.txt=tCode.txt+"0" + // event,buttonPress2,entn,arm1,tCode + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+=vaAddBtn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + tCode.txt="" Button b10 Attributes @@ -339,12 +362,12 @@ Button b10 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : CLR + Text : 0 Max. Text Size : 10 Events Touch Press Event - tCode.txt="" + tCode.txt=tCode.txt+"0" Button arm1 Attributes @@ -466,6 +489,20 @@ Button arm4 prints crcval,2 tCode.txt="" +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="" + Hotspot mSwipeNext Attributes Scope : local @@ -667,6 +704,15 @@ Timer tmSerial { tmFlash.en=0 } + // extra button + spstr strCommand.txt,b9.txt,"~",15 + if(b9.txt!="") + { + vis b9,1 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,b9.pco,0,0 + spstr strCommand.txt,vaAddBtn.txt,"~",17 + } } if(tInstruction.txt=="time") { @@ -683,7 +729,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 84a12478..33dc6abe 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -12,6 +12,7 @@ Page cardEntities Events Preinitialize Event + dim=dimValueNormal //wup=cardEntities //remove background & activate reparse mode vis p0,0 diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 90641005..49246ebe 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -12,7 +12,7 @@ Page cardGrid Events Preinitialize Event - //wup=cardEntities + dim=dimValueNormal //remove background & activate reparse mode vis p0,0 recmod=1 diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 35913768..ad020c44 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -12,6 +12,7 @@ Page cardMedia Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index d9fe4bd4..d818ad74 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -12,6 +12,7 @@ Page cardQR Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 4cf78ed9..a0043c63 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -12,6 +12,7 @@ Page cardThermo Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 4c4b5703..9db8b418 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -12,6 +12,7 @@ Page popupLight Events Preinitialize Event + dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt //get entity id diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index 0f032184..c1db9a2c 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -12,6 +12,7 @@ Page popupNotify Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tTmp,0 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 6c7b272d..84bdcc23 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -12,6 +12,7 @@ Page popupShutter Events Preinitialize Event + dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt //get entity id diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index da084411..0c8901ce 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 19:51:39.518226029 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.522226060 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000 @@ -33,7 +33,6 @@ vis b8,0 vis b9,0 @@ -21,104 +21,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt vis tCode,0 vis bPrev,0 vis bNext,0 -@@ -80,12 +79,6 @@ - Text : - Max. Text Size: 20 - --Variable (string) vaAddBtn -- Attributes -- Scope : local -- Text : -- Max. Text Size: 20 -- - Text tTmp - Attributes - Scope : local -@@ -333,27 +326,12 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -+ Text : 0 - Max. Text Size : 10 - - Events - Touch Press Event -- // event,buttonPress2,entn,arm1,tCode -- tSend.txt="event,buttonPress2," -- tSend.txt+=entn.txt+"," -- tSend.txt+=vaAddBtn.txt -- //send calc crc -- btlen tSend.txt,sys0 -- crcrest 1,0xffff // reset CRC -- crcputh 55 bb -- crcputs sys0,2 -- crcputs tSend.txt,0 -- //send cmd -- printh 55 bb -- prints sys0,2 -- prints tSend.txt,0 -- prints crcval,2 -- tCode.txt="" -+ tCode.txt=tCode.txt+"0" - - Button b10 - Attributes -@@ -362,12 +340,12 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : 0 -+ Text : CLR - Max. Text Size : 10 - - Events - Touch Press Event -- tCode.txt=tCode.txt+"0" -+ tCode.txt="" - - Button arm1 - Attributes -@@ -489,20 +467,6 @@ - prints crcval,2 - tCode.txt="" - --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="" -- - Hotspot mSwipeNext - Attributes - Scope : local -@@ -704,15 +668,6 @@ - { - tmFlash.en=0 - } -- // extra button -- spstr strCommand.txt,b9.txt,"~",15 -- if(b9.txt!="") -- { -- vis b9,1 -- spstr strCommand.txt,tTmp.txt,"~",16 -- covx tTmp.txt,b9.pco,0,0 -- spstr strCommand.txt,vaAddBtn.txt,"~",17 -- } - } - if(tInstruction.txt=="time") - { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 19:51:39.522226060 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -574,8 +479,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 19:51:39.518226029 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000 @@ -35,7 +35,7 @@ Attributes Scope : local @@ -586,8 +491,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 19:51:39.522226060 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -607,8 +512,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 19:51:39.086222656 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 19:51:39.522226060 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index a5344f98..f29700df 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 19:51:39.538226185 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 19:51:39.518226029 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 20:13:57.437039326 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.522226060 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000 +@@ -33,7 +33,6 @@ + vis b8,0 + vis b9,0 @@ -12,103 +12,8 @@ + vis tCode,0 + vis bPrev,0 + vis bNext,0 -+@@ -80,12 +79,6 @@ -+ Text : -+ Max. Text Size: 20 -+ -+-Variable (string) vaAddBtn -+- Attributes -+- Scope : local -+- Text : -+- Max. Text Size: 20 -+- -+ Text tTmp -+ Attributes -+ Scope : local -+@@ -333,27 +326,12 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : -++ Text : 0 -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+- // event,buttonPress2,entn,arm1,tCode -+- tSend.txt="event,buttonPress2," -+- tSend.txt+=entn.txt+"," -+- tSend.txt+=vaAddBtn.txt -+- //send calc crc -+- btlen tSend.txt,sys0 -+- crcrest 1,0xffff // reset CRC -+- crcputh 55 bb -+- crcputs sys0,2 -+- crcputs tSend.txt,0 -+- //send cmd -+- printh 55 bb -+- prints sys0,2 -+- prints tSend.txt,0 -+- prints crcval,2 -+- tCode.txt="" -++ tCode.txt=tCode.txt+"0" -+ -+ Button b10 -+ Attributes -+@@ -362,12 +340,12 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : 0 -++ Text : CLR -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+- tCode.txt=tCode.txt+"0" -++ tCode.txt="" -+ -+ Button arm1 -+ Attributes -+@@ -489,20 +467,6 @@ -+ prints crcval,2 -+ tCode.txt="" -+ -+-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="" -+- -+ Hotspot mSwipeNext -+ Attributes -+ Scope : local -+@@ -704,15 +668,6 @@ -+ { -+ tmFlash.en=0 -+ } -+- // extra button -+- spstr strCommand.txt,b9.txt,"~",15 -+- if(b9.txt!="") -+- { -+- vis b9,1 -+- spstr strCommand.txt,tTmp.txt,"~",16 -+- covx tTmp.txt,b9.pco,0,0 -+- spstr strCommand.txt,vaAddBtn.txt,"~",17 -+- } -+ } -+ if(tInstruction.txt=="time") -+ { -+--- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 19:51:39.522226060 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -118,11 +23,11 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 19:51:39.518226029 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000 +@@ -35,7 +35,7 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 19:51:39.522226060 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-30 19:51:39.086222656 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 19:51:39.522226060 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000 +@@ -474,22 +474,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 822fb348..294a8805 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -94,6 +94,13 @@ Variable (string) va4 Text : Max. Text Size: 20 +Variable (string) vaAddBtn + Attributes + ID : 39 + Scope : local + Text : + Max. Text Size: 20 + Text tTmp Attributes ID : 2 @@ -712,7 +719,60 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 116 + x coordinate : 24 + y coordinate : 424 + Width : 75 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Border Color : 6371 + Border Width : 2 + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + 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 + // event,buttonPress2,entn,arm1,tCode + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+=vaAddBtn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + tCode.txt="" + +Button b10 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 117 y coordinate : 424 Width : 75 Height : 50 @@ -742,44 +802,6 @@ Button b9 Touch Press Event tCode.txt=tCode.txt+"0" -Button b10 - Attributes - ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 209 - y coordinate : 424 - Width : 75 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : border - Border Color : 6371 - Border Width : 2 - Font ID : 0 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 1374 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : CLR - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - tCode.txt="" - Button arm1 Attributes ID : 24 @@ -996,6 +1018,44 @@ Button arm4 prints crcval,2 tCode.txt="" +Button b11 + Attributes + ID : 38 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 209 + y coordinate : 424 + Width : 75 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Border Color : 6371 + Border Width : 2 + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : CLR + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tCode.txt="" + Hotspot mSwipeNext Attributes ID : 35 @@ -1225,6 +1285,15 @@ Timer tmSerial { tmFlash.en=0 } + // extra button + spstr strCommand.txt,b9.txt,"~",15 + if(b9.txt!="") + { + vis b9,1 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,b9.pco,0,0 + spstr strCommand.txt,vaAddBtn.txt,"~",17 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index a09854c0..13c982d3 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -43,9 +43,9 @@ cardMedia 349 Line(s) of event code 183 Unique line(s) of event code cardAlarm - 38 Component(s) - 363 Line(s) of event code - 228 Unique line(s) of event code + 40 Component(s) + 384 Line(s) of event code + 234 Unique line(s) of event code pageStartup 19 Component(s) 157 Line(s) of event code @@ -57,6 +57,6 @@ screensaver Total 13 Page(s) - 416 Component(s) - 4699 Line(s) of event code - 1236 Unique line(s) of event code + 418 Component(s) + 4720 Line(s) of event code + 1241 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 0b2db7dd..f028be52 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -79,6 +79,12 @@ Variable (string) va4 Text : Max. Text Size: 20 +Variable (string) vaAddBtn + Attributes + Scope : local + Text : + Max. Text Size: 20 + Text tTmp Attributes Scope : local @@ -326,12 +332,27 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : 0 + Text : Max. Text Size : 10 Events Touch Press Event - tCode.txt=tCode.txt+"0" + // event,buttonPress2,entn,arm1,tCode + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+=vaAddBtn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + tCode.txt="" Button b10 Attributes @@ -340,12 +361,12 @@ Button b10 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : CLR + Text : 0 Max. Text Size : 10 Events Touch Press Event - tCode.txt="" + tCode.txt=tCode.txt+"0" Button arm1 Attributes @@ -467,6 +488,20 @@ Button arm4 prints crcval,2 tCode.txt="" +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="" + Hotspot mSwipeNext Attributes Scope : local @@ -668,6 +703,15 @@ Timer tmSerial { tmFlash.en=0 } + // extra button + spstr strCommand.txt,b9.txt,"~",15 + if(b9.txt!="") + { + vis b9,1 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,b9.pco,0,0 + spstr strCommand.txt,vaAddBtn.txt,"~",17 + } } if(tInstruction.txt=="time") {