diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index accf6e3e..2957766f 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -75,6 +75,7 @@ jobs: continue-on-error: true run: | find -name "**.txt" + rm Nextion2Text.py* - uses: stefanzweifel/git-auto-commit-action@v4 with: diff --git a/HMI/README.md b/HMI/README.md index 9f0592f7..6414f1c7 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -37,11 +37,11 @@ wake screen: `wake` -set brightness of screensaver: +set brightness of screensaver and active-brightness: -`dimmode~0 - (screen off)` +`dimmode~0~100 - (screen off)` -`dimmode~100 - (screen on with full brightness)` +`dimmode~100~100 - (screen on with full brightness)` set current time: diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5373664e..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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 21:20:55.900415426 +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,25 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -683,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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -1924,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 @@ -38,8 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 21:20:55.904415457 +0000 +--- 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 @@ -52,9 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -635,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 @@ -67,9 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -581,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 @@ -82,9 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -1169,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 @@ -96,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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 21:20:55.900415426 +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 @@ -119,9 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -560,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 @@ -133,9 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-29 21:20:55.900415426 +0000 -@@ -310,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 @@ -147,9 +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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-29 21:20:55.904415457 +0000 -@@ -405,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 @@ -161,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-29 21:20:55.128409486 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-29 21:20:55.904415457 +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/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index ba393bfd..47775ddb 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 269ffae2..01a00f37 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index a48e1bff..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-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 21:20:55.500412348 +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,24 +11,20 @@ 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-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -683,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") - { +--- 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 + vis b10,0 +- vis b11,0 + vis tCode,0 + vis bPrev,0 + vis bNext,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -62,6 +62,16 @@ +--- 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 vis nNum4,0 @@ -45,7 +41,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt vis bPrev,0 vis bNext,0 -@@ -119,6 +129,18 @@ +@@ -120,6 +130,18 @@ Text : Max. Text Size: 80 @@ -64,7 +60,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Number nNum1 Attributes Scope : local -@@ -155,6 +177,15 @@ +@@ -156,6 +178,15 @@ Associated Keyboard : none Value : 0 @@ -80,7 +76,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Text tHeading Attributes Scope : local -@@ -285,6 +316,26 @@ +@@ -286,6 +317,26 @@ Text : Max. Text Size : 50 @@ -107,7 +103,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Picture p0 Attributes Scope : local -@@ -404,6 +455,34 @@ +@@ -405,6 +456,34 @@ prints tSend.txt,0 prints crcval,2 @@ -142,7 +138,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Button bDown1 Attributes Scope : local -@@ -861,6 +940,106 @@ +@@ -862,6 +941,106 @@ prints tSend.txt,0 prints crcval,2 @@ -249,7 +245,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes Scope : local -@@ -969,6 +1148,33 @@ +@@ -970,6 +1149,33 @@ prints tSend.txt,0 prints crcval,2 @@ -283,7 +279,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1074,6 +1280,28 @@ +@@ -1075,6 +1281,28 @@ page popupLight } @@ -312,7 +308,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1849,6 +2077,169 @@ +@@ -1850,6 +2078,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -482,50 +478,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -@@ -1924,10 +2315,6 @@ - // 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 - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -846,10 +846,6 @@ - // 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 - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -635,10 +635,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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -34,7 +34,7 @@ +--- 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 Text : @@ -534,35 +490,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes -@@ -581,10 +581,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -1169,10 +1169,6 @@ - // 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 - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 21:20:55.500412348 +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 @@ -581,73 +511,10 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -273,10 +273,6 @@ - // 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 - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -560,10 +560,6 @@ - // 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 - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -310,10 +310,6 @@ - // 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 - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -405,10 +405,6 @@ - // 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 - } - if(tInstruction.txt=="time") - { diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 21:20:55.500412348 +0000 -@@ -397,9 +397,6 @@ - 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 - } - if(tInstruction.txt=="time") - { -@@ -474,22 +471,6 @@ +--- 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 vis tMR,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index a4094d2a..f29700df 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,157 +1,33 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 21:20:55.512412440 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 21:20:55.500412348 +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-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -683,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") -+ { -+--- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -1849,6 +2077,169 @@ -+@@ -1924,10 +2315,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -846,10 +846,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -635,10 +635,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") -+ { -+--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -581,10 +581,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -1169,10 +1169,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+--- HMI/n2t-out/pageStartup.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -273,10 +273,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -560,10 +560,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -310,10 +310,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="timeout") -+ { -+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -405,10 +405,6 @@ -+ // 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 -+ } -+ if(tInstruction.txt=="time") -+ { -+--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 21:20:55.500412348 +0000 -+@@ -397,9 +397,6 @@ -+ 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 -+ } -+ if(tInstruction.txt=="time") -+ { -+@@ -474,22 +471,6 @@ ++--- 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 ++ vis b10,0 ++- vis b11,0 ++ vis tCode,0 ++ vis bPrev,0 ++ vis bNext,0 ++--- 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 @@ ++@@ -286,6 +317,26 @@ ++@@ -405,6 +456,34 @@ ++@@ -862,6 +941,106 @@ ++@@ -970,6 +1149,33 @@ ++@@ -1075,6 +1281,28 @@ ++@@ -1850,6 +2078,169 @@ ++--- 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 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 242b4086..294a8805 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/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 @@ -93,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 @@ -711,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 @@ -741,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 @@ -995,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 @@ -1224,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") { @@ -1240,7 +1310,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/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 3861fe1b..a719fbda 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/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 @@ -3480,6 +3481,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index f96db85a..3e6d47b0 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/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 @@ -1310,6 +1310,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 33d54b08..eaac00ca 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/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 @@ -1084,7 +1085,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/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 3145a9e8..815594b4 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/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 @@ -871,7 +872,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/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index dff61ab0..88365b4b 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/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 @@ -1950,6 +1951,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { 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 f6ce3b55..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 @@ -2,10 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -cardAlarm - 38 Component(s) - 360 Line(s) of event code - 226 Unique line(s) of event code +cardQR + 30 Component(s) + 362 Line(s) of event code + 211 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -14,49 +14,49 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -popupNotify - 17 Component(s) - 200 Line(s) of event code - 125 Unique line(s) of event code -cardGrid - 42 Component(s) - 435 Line(s) of event code - 256 Unique line(s) of event code popupLight 27 Component(s) - 348 Line(s) of event code - 188 Unique line(s) of event code -cardQR - 30 Component(s) - 359 Line(s) of event code - 209 Unique line(s) of event code -cardMedia - 33 Component(s) - 346 Line(s) of event code - 181 Unique line(s) of event code -cardThermo - 56 Component(s) - 542 Line(s) of event code - 292 Unique line(s) of event code -pageStartup - 19 Component(s) - 154 Line(s) of event code - 115 Unique line(s) of event code + 352 Line(s) of event code + 191 Unique line(s) of event code popupShutter 20 Component(s) - 244 Line(s) of event code - 138 Unique line(s) of event code -screensaver - 37 Component(s) - 290 Line(s) of event code - 229 Unique line(s) of event code + 248 Line(s) of event code + 141 Unique line(s) of event code +popupNotify + 17 Component(s) + 204 Line(s) of event code + 128 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 295 Unique line(s) of event code cardEntities 77 Component(s) - 1359 Line(s) of event code - 578 Unique line(s) of event code + 1363 Line(s) of event code + 581 Unique line(s) of event code +cardGrid + 42 Component(s) + 439 Line(s) of event code + 259 Unique line(s) of event code +cardMedia + 33 Component(s) + 349 Line(s) of event code + 183 Unique line(s) of event code +cardAlarm + 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 + 117 Unique line(s) of event code +screensaver + 37 Component(s) + 292 Line(s) of event code + 230 Unique line(s) of event code Total 13 Page(s) - 416 Component(s) - 4661 Line(s) of event code - 1234 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-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index ecc64ae6..451f5906 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -568,6 +568,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 6a5b36c6..87dd03b5 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/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 @@ -906,6 +907,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index e3d8bf9a..c7351ab5 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/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 @@ -519,6 +520,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index d7c97199..47af2b27 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/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 @@ -690,6 +691,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index ed75a9df..9bb6a031 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -942,6 +942,9 @@ Timer tmSerial 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 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 3b44119a..f028be52 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -12,6 +12,7 @@ Page cardAlarm Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 @@ -78,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 @@ -325,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 @@ -339,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 @@ -466,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 @@ -667,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") { @@ -683,7 +728,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/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 96e2e362..5a48f58d 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/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 @@ -2315,6 +2316,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 90641005..55ceab06 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/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 @@ -846,6 +846,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 35913768..030e57ad 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -12,6 +12,7 @@ Page cardMedia Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 @@ -635,7 +636,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/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 348cea14..212c8e9e 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -12,6 +12,7 @@ Page cardQR Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 @@ -581,7 +582,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/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 4cf78ed9..d97902c7 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -12,6 +12,7 @@ Page cardThermo Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tInstruction,0 @@ -1169,6 +1170,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index f1ab9aef..9a56e0bb 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -273,6 +273,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 4c4b5703..7c91169b 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/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 @@ -560,6 +561,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index 0f032184..68fc143d 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -12,6 +12,7 @@ Page popupNotify Events Preinitialize Event + dim=dimValueNormal vis p0,0 vis tSend,0 vis tTmp,0 @@ -310,6 +311,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 6c7b272d..13d22206 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/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 @@ -405,6 +406,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 96c870e3..846734c3 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -397,6 +397,9 @@ Timer tmSerial 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 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/nspanel.tft b/HMI/US/portrait/nspanel.tft deleted file mode 100644 index e93aa1ba..00000000 Binary files a/HMI/US/portrait/nspanel.tft and /dev/null differ diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 42cefbcc..798ca765 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index caeda4c7..2eedde7c 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/fonts/SPECIAL HMI NotoSans-Regular 24 (UTF_8).zi b/HMI/fonts/SPECIAL HMI NotoSans-Regular 24 (UTF_8).zi new file mode 100644 index 00000000..8eb8f21b Binary files /dev/null and b/HMI/fonts/SPECIAL HMI NotoSans-Regular 24 (UTF_8).zi differ diff --git a/HMI/fonts/SPECIAL HMI NotoSans-Regular 32 (UTF_8).zi b/HMI/fonts/SPECIAL HMI NotoSans-Regular 32 (UTF_8).zi new file mode 100644 index 00000000..215d6dad Binary files /dev/null and b/HMI/fonts/SPECIAL HMI NotoSans-Regular 32 (UTF_8).zi differ diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 5a01ce8f..36c23069 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/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 @@ -711,7 +720,60 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 116 + x coordinate : 25 + 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 : + 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 : 118 y coordinate : 266 Width : 75 Height : 50 @@ -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 : 209 - 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 @@ -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 : 209 + 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="" + Hotspot mSwipeNext Attributes ID : 35 @@ -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") { diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index ec54ba94..3643045b 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/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/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 6bafa672..76005942 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/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/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 4c082fca..fc16a500 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/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/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index a46379fa..fcfef71a 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/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/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 0a6ad2db..52865532 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/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/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 214aad4e..2b45a0aa 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,53 +10,53 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code +cardQR + 30 Component(s) + 362 Line(s) of event code + 211 Unique line(s) of event code popupNotify 17 Component(s) - 203 Line(s) of event code - 127 Unique line(s) of event code -cardAlarm - 38 Component(s) - 362 Line(s) of event code - 227 Unique line(s) of event code -popupShutter - 20 Component(s) - 247 Line(s) of event code - 140 Unique line(s) of event code -cardGrid - 42 Component(s) - 438 Line(s) of event code - 258 Unique line(s) of event code + 204 Line(s) of event code + 128 Unique line(s) of event code popupLight 27 Component(s) - 351 Line(s) of event code - 190 Unique line(s) of event code + 352 Line(s) of event code + 191 Unique line(s) of event code +popupShutter + 20 Component(s) + 248 Line(s) of event code + 141 Unique line(s) of event code +cardAlarm + 40 Component(s) + 385 Line(s) of event code + 235 Unique line(s) of event code cardMedia 33 Component(s) - 348 Line(s) of event code - 182 Unique line(s) of event code -screensaver - 37 Component(s) - 307 Line(s) of event code - 245 Unique line(s) of event code + 349 Line(s) of event code + 183 Unique line(s) of event code pageStartup 19 Component(s) 157 Line(s) of event code 117 Unique line(s) of event code +cardGrid + 42 Component(s) + 439 Line(s) of event code + 259 Unique line(s) of event code cardThermo 56 Component(s) - 545 Line(s) of event code - 294 Unique line(s) of event code + 546 Line(s) of event code + 295 Unique line(s) of event code +screensaver + 37 Component(s) + 307 Line(s) of event code + 245 Unique line(s) of event code cardEntities 65 Component(s) - 1132 Line(s) of event code - 495 Unique line(s) of event code -cardQR - 30 Component(s) - 361 Line(s) of event code - 210 Unique line(s) of event code + 1133 Line(s) of event code + 496 Unique line(s) of event code Total 13 Page(s) - 404 Component(s) - 4476 Line(s) of event code - 1180 Unique line(s) of event code + 406 Component(s) + 4507 Line(s) of event code + 1186 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index a8890d71..d1f1681a 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/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/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index a86ef261..3822fb2f 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/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/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index b49f09a6..fdb842af 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/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/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 81e53cc7..57f6e110 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/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") { diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 24da68fb..c8023456 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/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/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index ef68a62e..55ceab06 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/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/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 4ea1c305..030e57ad 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/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/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 442ce9f6..68012963 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/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/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index f86ac666..d97902c7 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/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/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 437085c1..7c91169b 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/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/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 58cbb0d5..68fc143d 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/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/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index f19300b7..13d22206 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/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/nspanel.HMI b/HMI/nspanel.HMI index 5d3fa909..4f6df1a7 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 865c0a51..915da75b 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/Nextion2Text.py b/Nextion2Text.py deleted file mode 100644 index b6d51484..00000000 --- a/Nextion2Text.py +++ /dev/null @@ -1,1842 +0,0 @@ -""" -Nextion2Text by Max Zuidberg - -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. -""" - -from string import whitespace -import sys -from pathlib import Path -import struct -from typing import List -import argparse -import copy -import json - - -class IndentList(list): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.indent = 4 - self.indentLevel = 0 - self.indentStr = " " - self.emptyLinesLimit = 1 - self.emptyLinesCount = 0 - - def appendIndent(self, newStr): - newStr: str - if not newStr.strip(whitespace): - if self.emptyLinesCount < self.emptyLinesLimit: - self.emptyLinesCount += 1 - else: - return - else: - self.emptyLinesCount = 0 - self.append(self.indentLevel * self.indent * self.indentStr + newStr) - - def appendIndentLine(self, newStr): - newStr: str - if not newStr.endswith("\n"): - newStr += "\n" - self.appendIndent(newStr) - - -class Component: - """ - How the attributes dict is organized: - attributes: - "encoded" name: - -1: default interpretation: - name: Name by which the encoded name will be replaced - type: int/str/strlist/bool - how to decode the content - mapping: optional: replace the values by a string - 12: Optional interpretation if attribute is part of a component of type 12 - """ - codeEvents = { - "codesload": "Preinitialize Event", - "codesloadend": "Postinitialize Event", - "codesdown": "Touch Press Event", - "codesup": "Touch Release Event", - "codesunload": "Page Exit Event", - "codestimer": "Timer Event", - "codesplayend": "Play Complete Event", - } - attributes = { - "type": { - "name": "Type", - "struct": "i", - "mapping": { - #Needs to contain all types, even if some get overridden afterwards. Order here is used for sorting later - 121: "Page", - 52: "Variable", - 54: "Number", - 59: "XFloat", - 116: "Text", - 55: "Scrolling Text", - 112: "Picture", - 113: "Crop Picture", - 58: "QR Code", - 106: "Progress Bar", - 122: "Gauge", - 0: "Waveform", - 1: "Slider", - 98: "Button", - 53: "Dual-state Button", - 56: "Checkbox", - 57: "Radio", - 67: "Switch", - 61: "Combo Box", - 68: "Text Select", - 62: "SLText", - 4: "Audio", - 60: "External Picture", - 2: "Gmov", - 3: "Video", - 66: "Data Record", - 63: "File Stream", - 65: "File Browser", - 109: "Hotspot", - 51: "Timer", - 5: "TouchCap", - -1: "Unknown", - }, - "type": { - 52: { - "sta": { - 0: { - "mapping": { - 52: "Variable (int32)", - }, - }, - 1: { - "mapping": { - 52: "Variable (string)", - }, - }, - }, - }, - }, - - }, - "id": { - "name": "ID", - "struct": "i", - }, - "vscope": { - "name": "Scope", - "struct": "i", - "mapping": { - 0: "local", - 1: "global", - }, - }, - "objname": { - "name": "Object Name", - "struct": "s", - }, - "sta": { - "name": "Fill", - "struct": "i", - "vis": True, - "mapping": { - 0: "crop image", - 1: "solid color", - 2: "image", - }, - "type": { - 52: {#Variable - "vis": False, - "ignore": True, - "mapping": { - 0: "int32", - 1: "string", - }, - }, - 58: {#QR Code - "name": "Logo overlay", - "mapping": { - 0: "no", - 1: "yes", - }, - }, - 121: {#Page - "mapping": { - 0: "no background (white)", - 1: "solid color", - 2: "picture", - }, - }, - 106: {#Progress Bar - "mapping": { - 0: "solid color", - 1: "image", - }, - }, - }, - "model": { - "P": { - "mapping": { - 0: "crop image", - 1: "solid color", - 2: "image", - 3: "transparent", - }, - "type": { - 121: {# Page - "mapping": { - 0: "no background (transparent)", - 1: "solid color", - 2: "picture", - }, - }, - }, - }, - }, - }, - "psta": { - "struct": "i", - "name": "Cursor Fill", - "vis": True, - "mapping": { - 0: "circular", - 1: "image", - 2: "square", - }, - "model": { - -1: { - "ignore": True, - }, - "P": { - "ignore": False, - }, - }, - }, - "style": { - "name": "Style", - "struct": "i", - "vis": True, - "mapping": { - 0: "flat", - 1: "border", - 2: "3D down", - 3: "3D up", - 4: "3D auto", - }, - "sta": { - -1: { - "ignore": True, - }, - 1: { - "ignore": False, - } - } - }, - "key": { - "struct": "i", - "name": "Associated Keyboard", - "mapping": { - 255: "none", - }, - }, - "font": { - "struct": "i", - "name": "Font ID", - "vis": True, - }, - "pw": { - "struct": "i", - "name": "Input Type", - "vis": True, - "mapping": { - 0: "character", - 1: "password", - }, - }, - "val": { - "name": "Value", - "struct": "i", - "type": { - 1: { - "name": "Position", - }, - 52: { - "sta": { - 1 : { - "ignore": True, - }, - }, - }, - 53: { - "name": "State", - "mapping": { - 0: "unpressed", - 1: "pressed", - }, - }, - 98: 53, - 56: { - "name": "State", - "mapping": { - 0: "unpressed", - 1: "pressed", - }, - }, - 57: 56, - 122: { - "name": "Angle (deg)", - } - }, - }, - "txt": { - "name": "Text", - "struct": "s", - "type": { - 52: { - "sta": { - 0 : { - "ignore": True, - }, - }, - }, - }, - }, - "txt_maxl":{ - "name": "Max. Text Size", - "struct": "i", - "type": { - 52: { - "sta": { - 0 : { - "ignore": True, - }, - }, - }, - }, - }, - "isbr": { - "struct": "i", - "name": "Word wrap", - "vis": True, - "mapping": { - 0: "disabled", - 1: "enabled", - }, - }, - "vvs0": { - "struct": "i", - "name": "Significant digits left", - "vis": True, - "type": { - 55: {# Scrolling Text - "ignore": True, - }, - 122: {# Gauge - "model": { - -1: { - "ignore": True, - }, - "P": { - "name": "Head width" - }, - }, - }, - }, - }, - "vvs1": { - "struct": "i", - "name": "Significant digits right", - "vis": True, - "type": { - 55: {# Scrolling Text - "ignore": True, - }, - 122: { # Gauge - "model": { - -1: { - "ignore": True, - }, - "P": { - "name": "Center width" - }, - }, - }, - }, - }, - "vvs2": { - "struct": "i", - "vis": True, - "type": { - 55: {# Scrolling Text - "ignore": True, - }, - 122: { # Gauge - "model": { - -1: { - "ignore": True, - }, - "P": { - "name": "Foot width" - }, - }, - }, - }, - }, - "vvs3": { - "struct": "i", - "vis": True, - "type": { - 55: {# Scrolling Text - "ignore": True, - }, - }, - }, - "lenth": { - "struct": "i", - "name": "Significant digits shown", - "vis": True, - "mapping": { - 0: "all", - }, - }, - "format": { - "struct": "i", - "name": "Format", - "vis": True, - "mapping": { - 0: "decimal", - 1: "hexadecimal", - 2: "decimal with digit grouping" - }, - "type": { - 122: {# Gauge - "name": "Angle offset", - "mapping": dict(), #disable default mapping - }, - }, - }, - "tim": { - "struct": "i", - "name": "Period (ms)", - "type": { - -1: { - "vis": True, - }, - 51: {# Timer - "vis": False, - }, - }, - }, - "en": { - "struct": "i", - "name": "Enabled", - "mapping": { - 0: "no", - 1: "yes", - }, - "type": { - -1: { - "vis": True, - }, - 51: {# Timer - "vis": False, - }, - }, - }, - "dis": { - "struct": "i", - "name": "Corner Radius (Perc.)", - "vis": True, - "model": { - -1: { - "ignore": True, - }, - "P": { - "ignore": False, - "type": { - 0: { # Waveform - "ignore": True, - }, - 122: { # Gauge - "ignore": True, - }, - }, - }, - }, - }, - "spax": { - "struct": "i", - "name": "Horizontal Spacing", - "vis": True, - }, - "spay": { - "struct": "i", - "name": "Vertical Spacing", - "vis": True, - }, - "xcen": { - "struct": "i", - "name": "Horizontal Alignment", - "vis": True, - "mapping": { - 0: "left", - 1: "center", - 2: "right", - }, - }, - "ycen": { - "struct": "i", - "name": "Vertical Alignment", - "vis": True, - "mapping": { - 0: "top", - 1: "center", - 2: "bottom", - }, - }, - "x": { - "name": "x coordinate", - "struct": "i", - "vis": True, - "type": { - 121: {# Page - "ignore": True, - }, - }, - #"model": { - # "P": { - # "drag": { - # 1: { - # "name": "Initial x coord." - # }, - # }, - # }, - #}, - }, - "y": { - "name": "y coordinate", - "struct": "i", - "vis": True, - "type": { - 121: {# Page - "ignore": True, - }, - }, - #"model": { - # "P": { - # "drag": { - # 1: { - # "name": "Initial y coord." - # }, - # }, - # }, - #}, - }, - "w": { - "name": "Width", - "struct": "i", - "vis": True, - type: { - 121: {# Page - "ignore": True, - }, - }, - }, - "h": { - "name": "Height", - "struct": "i", - "vis": True, - "type": { - 121: {# Page - "ignore": True, - }, - }, - }, - "bco": { - "name": "Back. Color", - "struct": "i", - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 2: 0, - }, - "type": { - 53: {# Button - "name": "Back. Color (Unpressed)", - } - } - }, - "bco1": { - "name": "Slided Back. Color", - "struct": "i", - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 2: 0, - }, - }, - "bco2": { - "struct": "i", - "name": "Back. Color (Pressed)", - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 2: 0, - }, - }, - "pco": { - "name": "Font Color", - "struct": "i", - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 2: 0, - }, - "type": { - 58: { - "name": "Foreground Color" - }, - 53: { - "name": "Font Color (Unpressed)" - }, - 98: 53, - }, - }, - "pco0": { - "struct": "i", - "name": "Channel 0 Color", - "vis": True, - }, - "pco1": { - "struct": "i", - "name": "Channel 1 Color", - "vis": True, - "ch": { - 1: { - "ignore": True, - }, - }, - }, - "pco2": { - "name": "Font Color (Pressed)", - "struct": "i", - "vis": True, - "ignore": True, - "type": { - 53: { - "sta": { - 1: { - "ignore": False, - }, - }, - }, - 98: 53, - 0: {# Waveform - "name": "Channel 2 Color", - "ch": { - 3: { - "ignore": False, - }, - 4: { - "ignore": False, - }, - }, - }, - }, - }, - "pco3": { - "struct": "i", - "name": "Channel 3 Color", - "vis": True, - "ignore": True, - "ch": { - 4: { - "ignore": False, - }, - }, - }, - "pic": { - "name": "Back. Picture ID", - "struct": "i", - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 1: 0, - }, - "type": { - 112: {#Picture - "name": "Picture ID", - }, - 53: {#Button - "name": "Background Picture ID (Unpressed)" - }, - 98: 53, #Dual-State Button - 58: {#QR Code - "sta": { - 0: { - "ignore": True, - }, - 1: { - "ignore": False, - }, - }, - }, - }, - }, - "pic1": { - "name": "Slided Back. Picture ID", - "struct": "i", - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 1: 0, - }, - }, - "pic2": { - "name": "Back. Picture ID (Pressed)", - "struct": "i", - "ignore": True, - "vis": True, - "sta": { - 0: { - "ignore": True, - }, - 1: 0, - }, - "type": { - 53: {#Button - "ignore": False, - }, - 98: 53, - }, - }, - "picc": { - "name": "Cropped Back. Picture ID", - "struct": "i", - "vis": True, - "sta": { - 1: { - "ignore": True, - }, - 2: 1, - }, - "type": { - 53: { - "name": "Cropped Back. Picture ID (Unpressed)" - }, - 98: 53, - }, - }, - "picc1": { - "name": "Cropped Slided Back. Picture ID", - "struct": "i", - "vis": True, - "sta": { - 1: { - "ignore": True, - }, - 2: 1, - }, - }, - "picc2": { - "name": "Cropped Back. Picture ID (Pressed)", - "struct": "i", - "vis": True, - "sta": { - 1: { - "ignore": True, - }, - 2: 1, - }, - }, - "bpic": { - "struct": "i", - "name": "Background Picture ID", - "vis": True, - }, - "ppic": { - "struct": "i", - "name": "Foreground Picture ID", - "vis": True, - }, - - "dez": { - "name": "Direction", - "struct": "i", - "vis": True, - "mapping": { - 0: "horizontal", - 1: "vertical", - }, - }, - "dir": { - "struct": "i", - "name": "Direction", - "vis": True, - "type": { - 55: {# Scrolling Text - "mapping": { - 0: "left->right", - 1: "right->left", - 2: "top->bottom", - 3: "bottom->top", - }, - }, - 0: {# Waveform - "name": "Flow Direction", - "mapping": { - 0: "left->right", - 1: "right->left", - 2: "right aligned", - }, - }, - }, - }, - "borderc": { - "struct": "i", - "name": "Border Color", - "vis": True, - "style": { - -1: { - "ignore": True, - }, - 1: { - "ignore": False, - }, - }, - }, - "borderw": { - "struct": "i", - "name": "Border Width", - "vis": True, - "style": { - -1: { - "ignore": True, - }, - 1: { - "ignore": False, - }, - }, - }, - "mode": { - "name": "Direction", - "struct": "i", - "vis": True, - "mapping": { - 0: "horizontal", - 1: "vertical", - }, - "type": { - -1: { - "ignore": True, - }, - 1: { - "ignore": False, - }, - }, - }, - "maxval": { - "name": "Upper range limit", - "struct": "i", - "type": { - -1: { - "ignore": True, - }, - 1: { - "ignore": False, - }, - }, - }, - "minval": { - "name": "Lower range limit", - "struct": "i", - "type": { - -1: { - "ignore": True, - }, - 1: { - "ignore": False, - }, - }, - }, - "drag": { - "name": "Dragging", - "struct": "i", - "model": { - "T": { - "ignore": True, - }, - "K": "T", - "P": { - "type": { - 121: {# Page - "ignore": True - }, - }, - }, - }, - }, - "disup": { - "name": "Disable release event after dragging", - "struct": "i", - "model": { - "T": { - "ignore": True - }, - "K": "T", - "P": { - "type": { - 121: {# Page - "ignore": True - }, - }, - "drag": { - 0: { - "ignore": True - } - } - }, - }, - }, - "aph": { - "name": "Opacity", - "struct": "i", - "vis": True, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - }, - }, - "first": { - "name": "Effect Priority", - "struct": "i", - "vis": True, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - "P": { - "effect": { - 0: { - "ignore": True, - }, - }, - }, - }, - }, - "time": { - "name": "Effect Time", - "struct": "i", - "vis": True, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - "P": { - "effect": { - 0: { - "ignore": True, - }, - }, - }, - }, - }, - "sendkey": { - "name": "Send Component ID", - "struct": "i", - "mapping": { - 0: "disabled", - 1: "on release", - 2: "on press", - 3: "on press and release", - }, - }, - "movex": { - "name": "", - "struct": "i", - "vis": True, - "ignore": True - }, - "movey": { - "name": "", - "struct": "i", - "vis": True, - "ignore": True - }, - "endx": { - "name": "", - "struct": "i", - "vis": True, - "ignore": True - }, - "endy": { - "name": "", - "struct": "i", - "vis": True, - "ignore": True - }, - "effect": { - "name": "Effect", - "struct": "i", - "vis": True, - "mapping": { - 0: "load", - 1: "top fly into", - 2: "bottom fly into", - 3: "left fly into", - 4: "right fly into", - 5: "top left fly into", - 6: "top right fly into", - 7: "bottom left fly into", - 8: "bottom right fly into", - 9: "fade into the gradual change", - 10: "middle zoom", - }, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - }, - }, - "lockobj": { - "name": "Locked", - "struct": "i", - "mapping": { - 0: "no", - 1: "yes", - }, - "type": { - -1: { - "ignore": True, - }, - 121: { - "ignore": False, - }, - }, - }, - "groupid0": { - "struct": "i", - "ignore": True - }, - "groupid1": { - "struct": "i", - "ignore": True - }, - "ch": { - "struct": "i", - "ignore": True, - "type": { - 0: {# Waveform - "ignore": False, - }, - }, - "name": "Channel count", - }, - "gdc": { - "struct": "i", - "name": "Grid Color", - "vis": True, - }, - "gdw": { - "struct": "i", - "name": "Grid hor. spacing", - "vis": True, - }, - "gdh": { - "struct": "i", - "name": "Grid ver. spacing", - "vis": True, - }, - "wid": { - "struct": "i", - "vis": True, - "type": { - 1: {# Slider - "name": "Cursor width", - "mapping": { - 255: "auto", - }, - }, - 122: {# Gauge - "model": { - -1: { - "ignore": True, - }, - "P": { - "ignore": False, - "name": "Gauge Thickness", - }, - }, - }, - }, - }, - "hig": { - "struct": "i", - "vis": True, - "type": { - 1: {# Slider - "name": "Cursor height", - }, - 122: {# Gauge - "model": { - -1: { - "ignore": True, - }, - "P": { - "ignore": False, - "name": "Center circle dia.", - }, - }, - }, - }, - }, - "up": { - "name": "Swide up page ID", - "struct": "i", - "mapping": { - 255: "disabled", - }, - "type": { - 122: { # Gauge - "vis": True, - "name": "Head Length", - "mapping": { - 32767: "auto", - }, - }, - }, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - }, - }, - "down": { - "name": "Swide down page ID", - "struct": "i", - "mapping": { - 255: "disabled", - }, - "type": { - 122: { # Gauge - "vis": True, - "name": "Foot Length" - }, - }, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - }, - }, - "left": { - "name": "Swide left page ID", - "struct": "i", - "mapping": { - 255: "disabled", - }, - "type": { - 122: { # Gauge - "vis": True, - "name": "Head off-center" - }, - }, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - }, - }, - "right": { - "name": "Swide right page ID", - "struct": "i", - "mapping": { - 255: "disabled", - }, - "type": { - 122: { # Gauge - "vis": True, - "name": "Gauge Head Length" - }, - }, - "model": { - "T": { - "ignore": True, - }, - "K": "T", - }, - }, - "objWid": { - "struct": "i", - "ignore": True, - }, - "objHig": { - "struct": "i", - "ignore": True, - }, - "inittrue": { - "struct": "i", - "ignore": True, - }, - "molloc": { - "struct": "i", - "ignore": True, - }, - "molloc_s": { - "struct": "i", - "ignore": True, - }, - } - - def __init__(self, raw, modelSeries="T"): - self.components = [] - self.data = dict() - self.rawData = dict() - self.sloc = 0 - self.uniqueSloc = set() - self.propNameMaxLength = 0 - self.raw = raw - self.modelSeries = modelSeries - self.loadRawProperties() - - def __repr__(self): - repr = self.rawData["att"]["objname"] - data = self.parseRawProperties(customInclude=("type",), inplace=False) - if data and "Attributes" in data and Component.attributes["type"]["name"] in data["Attributes"]: - repr = data["Attributes"][Component.attributes["type"]["name"]] + " " + repr - return repr - - def getText(self, *args, **kwargs): - return "".join(self.getTextLines(*args, **kwargs)) - - def getTextLines(self, indentLevel=0, indent=4, emptyLinesLimit=1, - customExclude=("type", "objname"), **kwargs): - # Initialize resulting IndentList - result = IndentList() - result.indentStr = " " - result.indentLevel = indentLevel - result.indent = indent - result.emptyLinesLimit = emptyLinesLimit - result.appendIndentLine(self.__repr__()) - result.indentLevel += 1 - - # Parse rawData according to the given parameters - self.parseRawProperties(customExclude=customExclude, **kwargs) - if "Attributes" in self.data: - result.appendIndentLine("Attributes") - result.indentLevel += 1 - propNameMaxLength = max([len(k) for k in self.data["Attributes"].keys()]) - for prop, val in self.data["Attributes"].items(): - try: - val = val.replace("\r\n", "\\r\\n") - except: - pass - line = prop.ljust(propNameMaxLength, " ") + ": " + str(val) - result.appendIndentLine(line) - result.indentLevel -= 1 - result.appendIndentLine("") - if "Events" in self.data: - result.appendIndentLine("Events") - result.indentLevel += 1 - for event, code in self.data["Events"].items(): - code: str - result.appendIndentLine(event) - result.indentLevel += 1 - codeLines = code.split("\n") - for cl in codeLines: - originalLength = len(cl) - clStripped = cl.lstrip(" ") - clIndentLevel = (originalLength - len(clStripped)) // 2 - clStripped = result.indentStr * result.indent * clIndentLevel + clStripped - result.appendIndentLine(clStripped) - result.indentLevel -= 1 - result.appendIndentLine("") - result.indentLevel -=1 - result.appendIndentLine("") - return result - - def parseRawProperties(self, customInclude=tuple(), customExclude=tuple(), - includeVisual:bool=False, includeUnknown:int=0, - inplace=True, emptyEvents=False, - keepNames=False, keepValues=False, **kwargs): - - data = dict() - # Model name is considered as an "attribute", too. (needed to know the right interpretation; see below) - self.rawData["att"]["model"] = self.modelSeries - attributes = dict() - # The interpretation of any attribute can depend on other attributes. (see code below) - dependencies = set(Component.attributes.keys()) - dependencies.add("model") - for attName, attData in self.rawData["att"].items(): - if attName in customExclude: - continue - if attName in Component.attributes.keys(): - # Build dictionary that interpretes and ignores the right attributes. - # attProperties = dict() - # attProperties.update(self.attributes[attName]) - # Enforce deep copy - attProperties = copy.deepcopy(Component.attributes[attName]) - done = False - while not done: - done = True - keys = [k for k in attProperties.keys()] - for d in keys: - if d in dependencies: - done = False - if d in self.rawData["att"]: - val = self.rawData["att"][d] - foundVal = True - if val in attProperties[d]: - i = val - elif -1 in attProperties[d]: - i = -1 - else: - foundVal = False - if foundVal: - while not type(attProperties[d][i]) is dict: - vOld = i - i = attProperties[d][i] - attProperties[d].pop(vOld) - attProperties.update(attProperties[d][i]) - attProperties.pop(d) - if customInclude and attName not in customInclude: - attProperties["ignore"] = True - if ("vis" in attProperties and attProperties["vis"]) and not includeVisual: - attProperties["ignore"] = True - if (not "ignore" in attProperties or not attProperties["ignore"]): - if "name" in attProperties and not keepNames: - attName = attProperties["name"] - if "mapping" in attProperties and not keepValues: - if attData in attProperties["mapping"]: - attData = attProperties["mapping"][attData] - attributes[attName] = attData - elif attName != "model" and (includeUnknown or attName in customInclude): - if not attName in customInclude: - attName = "UNKNOWN " + attName - if len(attData) > 4 or includeUnknown == 2:#raw - attData = attData.decode("iso_8859_1") - elif includeUnknown == 3:#hex - attData = " ".join([hex(d)[2:] for d in attData]) - elif len(attData) <= 4: - val = 0 - for b in reversed(attData): - val = (val << 8) + b - attData = val - attributes[attName] = attData - data["Attributes"] = attributes - # model "attribute" is no longer needed and doesnt belong here anymore - self.rawData["att"].pop("model") - for attName, attData in self.rawData.items(): - if not attName.startswith("codes") or (not includeUnknown and attName not in Component.codeEvents): - continue - if not emptyEvents and not attData: - continue - if not "Events" in data: - data["Events"] = dict() - if attName in Component.codeEvents: - attName = Component.codeEvents[attName] - data["Events"][attName] = attData - if inplace: - self.data = data - else: - return data - - def loadRawProperties(self): - # First level parsing. Find all property entries - index = 0 - properties = list() - while index < len(self.raw): - length = struct.unpack_from("