diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5d24253c..552a7c5e 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-08-31 18:53:56.794842960 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-31 18:53:57.834857361 +0000 +--- HMI/n2t-out/Program.s.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-15 15:16:32.983793313 +0000 @@ -14,6 +14,3 @@ //color vars int defaultFontColor=65535 @@ -8,18 +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 +Only in HMI/n2t-out: cardPower.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-31 18:53:56.794842960 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-31 18:53:57.834857361 +0000 -@@ -152,7 +152,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : 41 -+ Text : 42 - Max. Text Size : 10 - - Picture p0 +--- HMI/n2t-out/pageStartup.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-15 15:16:32.983793313 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -30,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-31 18:53:56.794842960 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-31 18:53:57.834857361 +0000 +--- HMI/n2t-out/pageTest.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-15 15:16:32.983793313 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -69,10 +61,24 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Picture p0 Attributes -@@ -220,82 +190,3 @@ +@@ -220,96 +190,3 @@ Touch Press Event page cardQR +-Button b12 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text : power +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- page cardPower +- -Timer tmSerial - Attributes - Scope : local diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index f0a4ff82..9b3adef5 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -84,7 +84,7 @@ Variable (string) tSend ID : 25 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) va1 Attributes @@ -1362,6 +1362,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 90c214e2..024bf487 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -103,63 +103,70 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 41 + ID : 40 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 42 + ID : 41 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 43 + ID : 42 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 44 + ID : 43 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 45 + ID : 44 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 46 + ID : 45 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 47 + ID : 46 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 64 + Scope : local + Text : + Max. Text Size: 200 + Number nNum1 Attributes - ID : 54 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -189,7 +196,7 @@ Number nNum1 Number nNum2 Attributes - ID : 55 + ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -219,7 +226,7 @@ Number nNum2 Number nNum3 Attributes - ID : 56 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -249,7 +256,7 @@ Number nNum3 Number nNum4 Attributes - ID : 57 + ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -547,39 +554,9 @@ Text tIcon4 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 0 - Width : 230 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -609,7 +586,7 @@ Text tTmp Text tInstruction Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -639,7 +616,7 @@ Text tInstruction Text tId Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -686,7 +663,7 @@ Picture p0 Slider hSlider1 Attributes - ID : 50 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -729,7 +706,7 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 51 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -772,7 +749,7 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 52 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -815,7 +792,7 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 53 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1422,7 +1399,7 @@ Button bUp4 Button bPrev Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1476,7 +1453,7 @@ Button bPrev Button bNext Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1523,7 +1500,7 @@ Button bNext Button bText1 Attributes - ID : 61 + ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1570,7 +1547,7 @@ Button bText1 Button bText2 Attributes - ID : 62 + ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1617,7 +1594,7 @@ Button bText2 Button bText3 Attributes - ID : 63 + ID : 62 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1664,7 +1641,7 @@ Button bText3 Button bText4 Attributes - ID : 64 + ID : 63 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1891,7 +1868,7 @@ Dual-state Button btOnOff4 Hotspot mSpecial Attributes - ID : 35 + ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1917,7 +1894,7 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 37 + ID : 36 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1952,7 +1929,7 @@ Hotspot m2 Hotspot m1 Attributes - ID : 38 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1987,7 +1964,7 @@ Hotspot m1 Hotspot m0 Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2022,7 +1999,7 @@ Hotspot m0 Hotspot m3 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2057,7 +2034,7 @@ Hotspot m3 Hotspot mSwipeNext Attributes - ID : 58 + ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2077,7 +2054,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 59 + ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2097,7 +2074,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 60 + ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2117,7 +2094,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 30 + ID : 29 Scope : local Period (ms): 50 Enabled : yes @@ -2805,6 +2782,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -2914,7 +2892,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 36 + ID : 35 Scope : local Period (ms): 1000 Enabled : yes @@ -2945,7 +2923,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 49 + ID : 48 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index f289139a..cdfec361 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -63,88 +63,95 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 14 + ID : 13 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 16 + ID : 15 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 19 + ID : 18 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 20 + ID : 19 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (string) type5 Attributes - ID : 34 + ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) type6 Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) entn5 Attributes - ID : 36 + ID : 35 Scope : local Text : Max. Text Size: 80 Variable (string) entn6 Attributes - ID : 37 + ID : 36 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 200 + Text tHeading Attributes ID : 2 @@ -205,39 +212,9 @@ Text tEntity1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 20 - y coordinate : 0 - Width : 230 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 6 + ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -267,7 +244,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -297,7 +274,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -327,7 +304,7 @@ Text tId Text tEntity2 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -357,7 +334,7 @@ Text tEntity2 Text tEntity3 Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -387,7 +364,7 @@ Text tEntity3 Text tEntity4 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -417,7 +394,7 @@ Text tEntity4 Text tEntity5 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -447,7 +424,7 @@ Text tEntity5 Text tEntity6 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -494,7 +471,7 @@ Picture p0 Button bPrev Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -548,7 +525,7 @@ Button bPrev Button bNext Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -595,7 +572,7 @@ Button bNext Button bEntity1 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -653,7 +630,7 @@ Button bEntity1 Button bEntity2 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -711,7 +688,7 @@ Button bEntity2 Button bEntity3 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -769,7 +746,7 @@ Button bEntity3 Button bEntity4 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -827,7 +804,7 @@ Button bEntity4 Button bEntity5 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -885,7 +862,7 @@ Button bEntity5 Button bEntity6 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -943,7 +920,7 @@ Button bEntity6 Hotspot mSpecial Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -969,7 +946,7 @@ Hotspot mSpecial Hotspot mSwipeNext Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -989,7 +966,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1009,7 +986,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1029,7 +1006,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -1247,6 +1224,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -1356,7 +1334,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 13 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1387,7 +1365,7 @@ Timer tmSleep Timer tmLP Attributes - ID : 38 + ID : 37 Scope : local Period (ms): 500 Enabled : no @@ -1405,7 +1383,7 @@ Timer tmLP TouchCap tc0 Attributes - ID : 22 + ID : 21 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index fd99e3f3..4f8aa2e2 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -47,71 +47,48 @@ Page cardMedia Variable (string) strCommand Attributes - ID : 7 + ID : 6 Scope : local Text : Max. Text Size: 750 Variable (string) entn Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 80 Variable (string) vaSpeakerList Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes - ID : 28 + ID : 27 Scope: local Value: 0 Variable (string) vaMenu Attributes - ID : 33 + ID : 32 Scope : local Text : Max. Text Size: 50 -Text tSend +Variable (string) tSend Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 16 - y coordinate : 0 - Width : 230 - Height : 15 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 200 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 33 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -141,7 +118,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -171,7 +148,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -201,7 +178,7 @@ Text tId Text tHeading Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +208,7 @@ Text tHeading Text tTitle Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -261,7 +238,7 @@ Text tTitle Text tAuthor Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -291,7 +268,7 @@ Text tAuthor Text t2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -340,7 +317,7 @@ Text t2 Text tPlayPause Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -389,7 +366,7 @@ Text tPlayPause Text t0 Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -438,7 +415,7 @@ Text t0 Text tIcon Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -486,7 +463,7 @@ Text tIcon Text t1 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -536,7 +513,7 @@ Text t1 Text t3 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -586,7 +563,7 @@ Text t3 Text t4 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -616,7 +593,7 @@ Text t4 Text tSpeaker Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -665,7 +642,7 @@ Text tSpeaker Text t6 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -707,7 +684,7 @@ Text t6 Text t5 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -773,7 +750,7 @@ Picture p0 Slider hVolume Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -819,7 +796,7 @@ Slider hVolume Button bNext Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -866,7 +843,7 @@ Button bNext Button bPrev Attributes - ID : 5 + ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -920,7 +897,7 @@ Button bPrev Hotspot mSwipeNext Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -940,7 +917,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -960,7 +937,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -980,7 +957,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 50 Enabled : yes @@ -1152,6 +1129,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -1232,7 +1210,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 + ID : 18 Scope : local Period (ms): 1000 Enabled : yes @@ -1263,7 +1241,7 @@ Timer tmSleep Timer tmCooldown Attributes - ID : 21 + ID : 20 Scope : local Period (ms): 100 Enabled : no @@ -1274,7 +1252,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 20 + ID : 19 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 711055cf..ee54c999 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -79,7 +79,7 @@ Variable (string) tSend ID : 10 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) tTmp Attributes @@ -948,6 +948,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index e454bd9c..162e0abd 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -161,7 +161,7 @@ Variable (string) tSend ID : 46 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 XFloat xTempDest1 Attributes @@ -315,7 +315,7 @@ XFloat xTempDest2 XFloat xTempDest Attributes - ID : 49 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -523,39 +523,9 @@ Text tCF2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tALbl - Attributes - ID : 47 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 22 - y coordinate : 260 - Width : 74 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : Action - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tCF Attributes - ID : 51 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -585,7 +555,7 @@ Text tCF Text tCurTemp Attributes - ID : 52 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -739,16 +709,16 @@ Dual-state Button bt0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 97 + x coordinate : 18 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -788,16 +758,16 @@ Dual-state Button bt2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 187 + x coordinate : 130 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -837,16 +807,16 @@ Dual-state Button bt4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 242 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -886,16 +856,16 @@ Dual-state Button bt6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 367 + x coordinate : 354 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -935,16 +905,16 @@ Dual-state Button bt1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 142 + x coordinate : 74 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -984,16 +954,16 @@ Dual-state Button bt3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 232 + x coordinate : 186 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1033,16 +1003,16 @@ Dual-state Button bt5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 322 + x coordinate : 298 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1082,16 +1052,16 @@ Dual-state Button bt7 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 410 y coordinate : 255 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1140,7 +1110,7 @@ Dual-state Button btUp1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1201,7 +1171,7 @@ Dual-state Button btDown1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1262,7 +1232,7 @@ Dual-state Button bUp2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1323,7 +1293,7 @@ Dual-state Button bDown2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1369,7 +1339,7 @@ Dual-state Button bDown2 Dual-state Button btUp Attributes - ID : 48 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1384,7 +1354,7 @@ Dual-state Button btUp Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1427,7 +1397,7 @@ Dual-state Button btUp Dual-state Button btDown Attributes - ID : 50 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1442,7 +1412,7 @@ Dual-state Button btDown Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1787,7 +1757,7 @@ Timer tmSerial //Text tStateLbl spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",44 //Text tCF spstr strCommand.txt,tCF.txt,"~",45 tCF1.txt=tCF.txt @@ -1813,6 +1783,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 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 4c517e42..3e89be76 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 @@ -14,30 +14,26 @@ pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code -popupLight - 27 Component(s) - 386 Line(s) of event code - 211 Unique line(s) of event code -cardMedia - 34 Component(s) - 388 Line(s) of event code - 209 Unique line(s) of event code popupShutter 25 Component(s) 388 Line(s) of event code 211 Unique line(s) of event code +cardMedia + 34 Component(s) + 389 Line(s) of event code + 210 Unique line(s) of event code +popupFan + 27 Component(s) + 342 Line(s) of event code + 199 Unique line(s) of event code cardQR 32 Component(s) - 403 Line(s) of event code - 234 Unique line(s) of event code -cardGrid - 42 Component(s) - 462 Line(s) of event code - 271 Unique line(s) of event code + 404 Line(s) of event code + 235 Unique line(s) of event code +popupLight + 27 Component(s) + 386 Line(s) of event code + 211 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code @@ -47,20 +43,24 @@ screensaver 341 Line(s) of event code 263 Unique line(s) of event code cardThermo - 53 Component(s) + 52 Component(s) 580 Line(s) of event code 303 Unique line(s) of event code -cardAlarm - 40 Component(s) - 421 Line(s) of event code - 254 Unique line(s) of event code +cardGrid + 42 Component(s) + 463 Line(s) of event code + 272 Unique line(s) of event code cardEntities 65 Component(s) - 1127 Line(s) of event code - 514 Unique line(s) of event code + 1128 Line(s) of event code + 515 Unique line(s) of event code +cardAlarm + 40 Component(s) + 422 Line(s) of event code + 255 Unique line(s) of event code Total 14 Page(s) - 432 Component(s) - 5150 Line(s) of event code - 1359 Unique line(s) of event code + 438 Component(s) + 5261 Line(s) of event code + 1405 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupFan.txt b/HMI/US/landscape/n2t-out-visual/popupFan.txt index c505d3c9..0302950c 100644 --- a/HMI/US/landscape/n2t-out-visual/popupFan.txt +++ b/HMI/US/landscape/n2t-out-visual/popupFan.txt @@ -47,7 +47,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<20;sys0++) + for(sys0=0;sys0<24;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -69,30 +69,57 @@ Page popupFan Variable (string) strCommand Attributes - ID : 13 + ID : 12 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 16 + ID : 15 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 17 + ID : 16 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 18 + ID : 17 Scope: local Value: 0 +Variable (int32) vaModePos + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (string) vaModeList + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur + Attributes + ID : 25 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) tSend + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 2 @@ -101,7 +128,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 108 + x coordinate : 107 y coordinate : 21 Width : 263 Height : 30 @@ -131,7 +158,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 26 y coordinate : 21 Width : 45 Height : 30 @@ -161,7 +188,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 59 + x coordinate : 58 y coordinate : 104 Width : 211 Height : 30 @@ -183,7 +210,7 @@ Text t1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tTmp Attributes ID : 8 Scope : local @@ -191,39 +218,9 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 16 - y coordinate : 0 - Width : 348 - Height : 7 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tTmp - Attributes - ID : 9 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 422 + x coordinate : 358 y coordinate : 277 - Width : 34 + Width : 97 Height : 30 Effect : load Effect Priority : 0 @@ -245,13 +242,13 @@ Text tTmp Text tInstruction Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 16 + x coordinate : 15 y coordinate : 290 Width : 100 Height : 30 @@ -275,13 +272,13 @@ Text tInstruction Text tId Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 116 + x coordinate : 115 y coordinate : 290 Width : 100 Height : 30 @@ -328,7 +325,7 @@ Slider hSpeed Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 60 + x coordinate : 59 y coordinate : 139 Width : 335 Height : 43 @@ -373,7 +370,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 413 + x coordinate : 412 y coordinate : 8 Width : 50 Height : 50 @@ -412,6 +409,233 @@ Button b0 prints tSend.txt,0 prints crcval,2 +Button bMode1 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 26 + y coordinate : 213 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode3 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 274 + y coordinate : 213 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode2 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 150 + y coordinate : 213 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bModeNext + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 403 + y coordinate : 213 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + Dual-state Button btOnOff1 Attributes ID : 7 @@ -420,7 +644,7 @@ Dual-state Button btOnOff1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 386 + x coordinate : 385 y coordinate : 79 Width : 50 Height : 50 @@ -460,7 +684,7 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 11 + ID : 10 Scope : local Period (ms): 1000 Enabled : yes @@ -480,7 +704,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 12 + ID : 11 Scope : local Period (ms): 50 Enabled : yes @@ -565,6 +789,37 @@ Timer tmSerial covx tTmp.txt,hSpeed.maxval,0,0 // set t1 Speed (Localization) spstr strCommand.txt,t1.txt,"~",7 + //current mode + spstr strCommand.txt,vaModeCur.txt,"~",8 + //mode list + spstr strCommand.txt,vaModeList.txt,"~",9 + if(vaModeList.txt=="") + { + vis bMode1,0 + vis bMode2,0 + vis bMode3,0 + vis bModeNext,0 + } + if(bMode1.txt=="") + { + click bModeNext,1 + click bModeNext,0 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } } if(tInstruction.txt=="time") { @@ -677,7 +932,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 19 + ID : 18 Scope : local Period (ms): 100 Enabled : no @@ -688,7 +943,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 10 + ID : 9 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 865716e5..87855eae 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -84,30 +84,37 @@ Page popupLight Variable (string) strCommand Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 23 + ID : 22 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 24 + ID : 23 Scope: local Value: 0 +Variable (string) tSend + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 3 @@ -288,39 +295,9 @@ Text t4 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 0 - Width : 348 - Height : 7 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -350,7 +327,7 @@ Text tTmp Text tInstruction Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -380,7 +357,7 @@ Text tInstruction Text tId Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -410,7 +387,7 @@ Text tId Text t0 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -547,7 +524,7 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -639,7 +616,7 @@ Button b0 Button bColor Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -742,7 +719,7 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 15 + ID : 14 Scope : local Period (ms): 1000 Enabled : yes @@ -762,7 +739,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 16 + ID : 15 Scope : local Period (ms): 50 Enabled : yes @@ -1027,7 +1004,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 100 Enabled : no @@ -1038,7 +1015,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 14 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index 344d7c16..be1cdb34 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -41,57 +41,34 @@ Page popupNotify Variable (string) strCommand Attributes - ID : 8 + ID : 7 Scope : local Text : Max. Text Size: 1000 Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 30 Variable (int32) vaOldSleepT Attributes - ID : 16 + ID : 15 Scope: local Value: 0 -Text tSend +Variable (string) tSend Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 0 - Width : 348 - Height : 22 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 16 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -121,7 +98,7 @@ Text tTmp Text tInstruction Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -151,7 +128,7 @@ Text tInstruction Text tId Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -181,7 +158,7 @@ Text tId Text tHeading Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -211,7 +188,7 @@ Text tHeading Text tText Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -306,7 +283,7 @@ Button b0 Button b2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -355,7 +332,7 @@ Button b2 Button b1 Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -404,7 +381,7 @@ Button b1 Timer tmSleep Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 1000 Enabled : yes @@ -424,7 +401,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -647,7 +624,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 5 + ID : 4 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index f65e0f3f..c18cfac4 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -85,39 +85,46 @@ Page popupShutter Variable (string) strCommand Attributes - ID : 9 + ID : 8 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 80 Variable (string) tInstruction Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 20 Variable (string) tTmp Attributes - ID : 19 + ID : 18 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 2 @@ -178,39 +185,9 @@ Text tIcon1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 16 - y coordinate : 0 - Width : 348 - Height : 22 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tPosHeading Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -240,7 +217,7 @@ Text tPosHeading Text tInfo1 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -270,7 +247,7 @@ Text tInfo1 Text tTiltHeading Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -317,7 +294,7 @@ Picture p0 Slider hPosition Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -361,7 +338,7 @@ Slider hPosition Slider hTilt Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -452,7 +429,7 @@ Button b0 Button bDown1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -499,7 +476,7 @@ Button bDown1 Button bStop1 Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -546,7 +523,7 @@ Button bStop1 Button bUp1 Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -593,7 +570,7 @@ Button bUp1 Button bTLeft Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -640,7 +617,7 @@ Button bTLeft Button bTStop Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -687,7 +664,7 @@ Button bTStop Button bTRight Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -734,7 +711,7 @@ Button bTRight Timer tmSleep Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 1000 Enabled : yes @@ -754,7 +731,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 8 + ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -1036,7 +1013,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 6 + ID : 5 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 4018e695..910af12c 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -73,7 +73,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) va1 Attributes @@ -780,6 +780,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 80d545c3..6b98a6b0 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -140,6 +140,12 @@ Variable (string) entn4 Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Number nNum1 Attributes Scope : local @@ -266,16 +272,6 @@ Text tIcon4 Text :  Max. Text Size : 5 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -1833,6 +1829,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index cb8a8847..521664fb 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -124,6 +124,12 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tHeading Attributes Scope : local @@ -144,16 +150,6 @@ Text tEntity1 Text : tEntity1 Max. Text Size : 30 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -783,6 +779,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index c1e67e37..f705403b 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -66,15 +66,11 @@ Variable (string) vaMenu Text : Max. Text Size: 50 -Text tSend +Variable (string) tSend Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 200 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes @@ -702,6 +698,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 62ad8746..7e2fc6a1 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -68,7 +68,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) tTmp Attributes @@ -649,6 +649,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index bac9c333..b6d86880 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -139,7 +139,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 XFloat xTempDest1 Attributes @@ -255,16 +255,6 @@ Text tCF2 Text :  Max. Text Size : 10 -Text tALbl - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Action - Max. Text Size : 30 - Text tCF Attributes Scope : local @@ -1069,7 +1059,7 @@ Timer tmSerial //Text tStateLbl spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",44 //Text tCF spstr strCommand.txt,tCF.txt,"~",45 tCF1.txt=tCF.txt @@ -1095,6 +1085,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/landscape/n2t-out/popupFan.txt b/HMI/US/landscape/n2t-out/popupFan.txt index bcce3670..35bb0d7e 100644 --- a/HMI/US/landscape/n2t-out/popupFan.txt +++ b/HMI/US/landscape/n2t-out/popupFan.txt @@ -39,7 +39,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<20;sys0++) + for(sys0=0;sys0<24;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -81,6 +81,29 @@ Variable (int32) mode_temp Scope: local Value: 0 +Variable (int32) vaModePos + Attributes + Scope: local + Value: 0 + +Variable (string) vaModeList + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -111,16 +134,6 @@ Text t1 Text : Max. Text Size : 50 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -213,6 +226,145 @@ Button b0 prints tSend.txt,0 prints crcval,2 +Button bMode1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bModeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 5 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + Dual-state Button btOnOff1 Attributes Scope : local @@ -346,6 +498,37 @@ Timer tmSerial covx tTmp.txt,hSpeed.maxval,0,0 // set t1 Speed (Localization) spstr strCommand.txt,t1.txt,"~",7 + //current mode + spstr strCommand.txt,vaModeCur.txt,"~",8 + //mode list + spstr strCommand.txt,vaModeList.txt,"~",9 + if(vaModeList.txt=="") + { + vis bMode1,0 + vis bMode2,0 + vis bMode3,0 + vis bModeNext,0 + } + if(bMode1.txt=="") + { + click bModeNext,1 + click bModeNext,0 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index cb0959db..718398aa 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -96,6 +96,12 @@ Variable (int32) mode_temp Scope: local Value: 0 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -156,16 +162,6 @@ Text t4 Text : Temperature Max. Text Size : 50 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index 393b540a..1276b257 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -48,15 +48,11 @@ Variable (int32) vaOldSleepT Scope: local Value: 0 -Text tSend +Variable (string) tSend Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 12468be5..b11f46c0 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -105,6 +105,12 @@ Variable (string) tTmp Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -125,16 +131,6 @@ Text tIcon1 Text :  Max. Text Size : 10 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tPosHeading Attributes Scope : local diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 50fc94e8..823e0adf 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-08-31 18:53:56.794842960 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-31 18:53:57.290849828 +0000 +--- HMI/n2t-out/Program.s.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 15:16:32.479794687 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-08-31 18:53:56.798843016 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-31 18:53:57.290849828 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-09-15 15:16:32.035795901 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 15:16:32.479794687 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -46,10 +46,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Text : + Max. Text Size: 10 + - Number nNum1 + Variable (string) tSend Attributes - Scope : local -@@ -176,6 +198,15 @@ + Scope : local +@@ -182,6 +204,15 @@ Associated Keyboard : none Value : 0 @@ -65,7 +65,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Text tHeading Attributes Scope : local -@@ -306,6 +337,26 @@ +@@ -302,6 +333,26 @@ Text : Max. Text Size : 50 @@ -92,7 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Picture p0 Attributes Scope : local -@@ -425,6 +476,34 @@ +@@ -421,6 +472,34 @@ prints tSend.txt,0 prints crcval,2 @@ -127,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Button bDown1 Attributes Scope : local -@@ -882,6 +961,106 @@ +@@ -878,6 +957,106 @@ prints tSend.txt,0 prints crcval,2 @@ -234,7 +234,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes Scope : local -@@ -990,6 +1169,33 @@ +@@ -986,6 +1165,33 @@ prints tSend.txt,0 prints crcval,2 @@ -268,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1111,6 +1317,32 @@ +@@ -1107,6 +1313,32 @@ page popupFan } @@ -301,7 +301,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1830,6 +2062,155 @@ +@@ -1826,6 +2058,155 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -457,9 +457,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +Only in HMI/n2t-out: cardPower.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-31 18:53:56.794842960 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-31 18:53:57.290849828 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 15:16:32.479794687 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -469,15 +470,6 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -152,7 +152,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : 41 -+ Text : 42 - Max. Text Size : 10 - - Picture p0 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -488,8 +480,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-31 18:53:56.794842960 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-31 18:53:57.290849828 +0000 +--- HMI/n2t-out/pageTest.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 15:16:32.479794687 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -527,10 +519,24 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Picture p0 Attributes -@@ -220,82 +190,3 @@ +@@ -220,96 +190,3 @@ Touch Press Event page cardQR +-Button b12 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text : power +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- page cardPower +- -Timer tmSerial - Attributes - Scope : local @@ -610,3 +616,111 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt - } - } - +diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt +--- HMI/n2t-out/popupFan.txt 2022-09-15 15:16:32.031795912 +0000 ++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 15:16:32.479794687 +0000 +@@ -81,23 +81,23 @@ + Scope: local + Value: 0 + +-Variable (int32) vaModePos +- Attributes +- Scope: local +- Value: 0 +- +-Variable (string) vaModeList ++Variable (string) vaModeCur + Attributes + Scope : local + Text : + Max. Text Size: 400 + +-Variable (string) vaModeCur ++Variable (string) vaModeList + Attributes + Scope : local + Text : + Max. Text Size: 400 + ++Variable (int32) vaModePos ++ Attributes ++ Scope: local ++ Value: 0 ++ + Variable (string) tSend + Attributes + Scope : local +@@ -256,7 +256,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Button bMode3 ++Button bMode2 + Attributes + Scope : local + Dragging : 0 +@@ -271,7 +271,7 @@ + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," +- sys2=vaModePos.val-1 ++ sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.txt + //send calc crc +@@ -286,7 +286,7 @@ + prints tSend.txt,0 + prints crcval,2 + +-Button bMode2 ++Button bMode3 + Attributes + Scope : local + Dragging : 0 +@@ -301,7 +301,7 @@ + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," +- sys2=vaModePos.val-2 ++ sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.txt + //send calc crc +@@ -498,37 +498,6 @@ + covx tTmp.txt,hSpeed.maxval,0,0 + // set t1 Speed (Localization) + spstr strCommand.txt,t1.txt,"~",7 +- //current mode +- spstr strCommand.txt,vaModeCur.txt,"~",8 +- //mode list +- spstr strCommand.txt,vaModeList.txt,"~",9 +- if(vaModeList.txt=="") +- { +- vis bMode1,0 +- vis bMode2,0 +- vis bMode3,0 +- vis bModeNext,0 +- } +- if(bMode1.txt=="") +- { +- click bModeNext,1 +- click bModeNext,0 +- } +- bMode1.pco=defaultFontColor +- bMode2.pco=defaultFontColor +- bMode3.pco=defaultFontColor +- if(bMode1.txt==vaModeCur.txt) +- { +- bMode1.pco=1374 +- } +- if(bMode2.txt==vaModeCur.txt) +- { +- bMode2.pco=1374 +- } +- if(bMode3.txt==vaModeCur.txt) +- { +- bMode3.pco=1374 +- } + } + if(tInstruction.txt=="time") + { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index a783da4d..931b5262 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-09-15 15:07:49.178958808 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-08-31 18:53:56.794842960 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-31 18:53:57.290849828 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-09-15 15:16:32.491794654 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-09-15 15:16:32.031795912 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 15:16:32.479794687 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-08-31 18:53:56.798843016 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-31 18:53:57.290849828 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-09-15 15:16:32.035795901 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 15:16:32.479794687 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -14,14 +14,16 @@ + for(sys0=0;sys0<65;sys0++) + { +@@ -140,6 +150,18 @@ -+@@ -176,6 +198,15 @@ -+@@ -306,6 +337,26 @@ -+@@ -425,6 +476,34 @@ -+@@ -882,6 +961,106 @@ -+@@ -990,6 +1169,33 @@ -+@@ -1111,6 +1317,32 @@ ++ Variable (string) tSend ++ Scope : local ++@@ -182,6 +204,15 @@ ++@@ -302,6 +333,26 @@ ++@@ -421,6 +472,34 @@ ++@@ -878,6 +957,106 @@ ++@@ -986,6 +1165,33 @@ ++@@ -1107,6 +1313,32 @@ + page popupFan -+@@ -1830,6 +2062,155 @@ ++@@ -1826,6 +2058,155 @@ ++ vis bUp5,0 ++ vis bStop5,0 ++ vis bDown5,0 @@ -33,20 +35,12 @@ ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff5.val=sys0 -+--- HMI/n2t-out/pageStartup.txt 2022-08-31 18:53:56.794842960 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-31 18:53:57.290849828 +0000 -+@@ -152,7 +152,7 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+- Text : 41 -++ Text : 42 -+ Max. Text Size : 10 -+ -+ Picture p0 ++Only in HMI/n2t-out: cardPower.txt ++--- HMI/n2t-out/pageStartup.txt 2022-09-15 15:16:32.031795912 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 15:16:32.479794687 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-08-31 18:53:56.794842960 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-31 18:53:57.290849828 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-09-15 15:16:32.031795912 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 15:16:32.479794687 +0000 +@@ -13,36 +13,6 @@ + Events + Preinitialize Event @@ -84,10 +78,24 @@ + + Picture p0 + Attributes -+@@ -220,82 +190,3 @@ ++@@ -220,96 +190,3 @@ + Touch Press Event + page cardQR + ++-Button b12 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- State : unpressed ++- Text : power ++- Max. Text Size : 10 ++- ++- Events ++- Touch Press Event ++- page cardPower ++- +-Timer tmSerial +- Attributes +- Scope : local @@ -167,3 +175,111 @@ +- } +- } +- ++diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt ++--- HMI/n2t-out/popupFan.txt 2022-09-15 15:16:32.031795912 +0000 +++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 15:16:32.479794687 +0000 ++@@ -81,23 +81,23 @@ ++ Scope: local ++ Value: 0 ++ ++-Variable (int32) vaModePos ++- Attributes ++- Scope: local ++- Value: 0 ++- ++-Variable (string) vaModeList +++Variable (string) vaModeCur ++ Attributes ++ Scope : local ++ Text : ++ Max. Text Size: 400 ++ ++-Variable (string) vaModeCur +++Variable (string) vaModeList ++ Attributes ++ Scope : local ++ Text : ++ Max. Text Size: 400 ++ +++Variable (int32) vaModePos +++ Attributes +++ Scope: local +++ Value: 0 +++ ++ Variable (string) tSend ++ Attributes ++ Scope : local ++@@ -256,7 +256,7 @@ ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++-Button bMode3 +++Button bMode2 ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -271,7 +271,7 @@ ++ //craft command ++ tSend.txt="event,buttonPress2," ++ tSend.txt+=entn.txt+"," ++- sys2=vaModePos.val-1 +++ sys2=vaModePos.val-2 ++ covx sys2,tTmp.txt,0,0 ++ tSend.txt+="mode-sel,"+tTmp.txt ++ //send calc crc ++@@ -286,7 +286,7 @@ ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++-Button bMode2 +++Button bMode3 ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -301,7 +301,7 @@ ++ //craft command ++ tSend.txt="event,buttonPress2," ++ tSend.txt+=entn.txt+"," ++- sys2=vaModePos.val-2 +++ sys2=vaModePos.val-1 ++ covx sys2,tTmp.txt,0,0 ++ tSend.txt+="mode-sel,"+tTmp.txt ++ //send calc crc ++@@ -498,37 +498,6 @@ ++ covx tTmp.txt,hSpeed.maxval,0,0 ++ // set t1 Speed (Localization) ++ spstr strCommand.txt,t1.txt,"~",7 ++- //current mode ++- spstr strCommand.txt,vaModeCur.txt,"~",8 ++- //mode list ++- spstr strCommand.txt,vaModeList.txt,"~",9 ++- if(vaModeList.txt=="") ++- { ++- vis bMode1,0 ++- vis bMode2,0 ++- vis bMode3,0 ++- vis bModeNext,0 ++- } ++- if(bMode1.txt=="") ++- { ++- click bModeNext,1 ++- click bModeNext,0 ++- } ++- bMode1.pco=defaultFontColor ++- bMode2.pco=defaultFontColor ++- bMode3.pco=defaultFontColor ++- if(bMode1.txt==vaModeCur.txt) ++- { ++- bMode1.pco=1374 ++- } ++- if(bMode2.txt==vaModeCur.txt) ++- { ++- bMode2.pco=1374 ++- } ++- if(bMode3.txt==vaModeCur.txt) ++- { ++- bMode3.pco=1374 ++- } ++ } ++ if(tInstruction.txt=="time") ++ { diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index b02dde6f..058005ec 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -84,7 +84,7 @@ Variable (string) tSend ID : 25 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) va1 Attributes @@ -1362,6 +1362,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 0cb6d34b..3293774e 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -113,77 +113,84 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 45 + ID : 44 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 46 + ID : 45 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 47 + ID : 46 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 49 + ID : 48 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 50 + ID : 49 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 51 + ID : 50 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 52 + ID : 51 Scope : local Text : Max. Text Size: 80 Variable (string) entn5 Attributes - ID : 62 + ID : 61 Scope : local Text : Max. Text Size: 80 Variable (string) type5 Attributes - ID : 63 + ID : 62 Scope : local Text : Max. Text Size: 10 +Variable (string) tSend + Attributes + ID : 76 + Scope : local + Text : + Max. Text Size: 200 + Number nNum1 Attributes - ID : 69 + ID : 68 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -213,7 +220,7 @@ Number nNum1 Number nNum2 Attributes - ID : 70 + ID : 69 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -243,7 +250,7 @@ Number nNum2 Number nNum3 Attributes - ID : 71 + ID : 70 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -273,7 +280,7 @@ Number nNum3 Number nNum4 Attributes - ID : 72 + ID : 71 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -303,7 +310,7 @@ Number nNum4 Number nNum5 Attributes - ID : 73 + ID : 72 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -601,39 +608,9 @@ Text tIcon4 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 230 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -663,7 +640,7 @@ Text tTmp Text tInstruction Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -693,7 +670,7 @@ Text tInstruction Text tId Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -723,7 +700,7 @@ Text tId Text tEntity5 Attributes - ID : 54 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -753,7 +730,7 @@ Text tEntity5 Text tIcon5 Attributes - ID : 55 + ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -800,7 +777,7 @@ Picture p0 Slider hSlider1 Attributes - ID : 64 + ID : 63 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -843,7 +820,7 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 65 + ID : 64 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -886,7 +863,7 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 66 + ID : 65 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -929,7 +906,7 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 67 + ID : 66 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -972,7 +949,7 @@ Slider hSlider4 Slider hSlider5 Attributes - ID : 68 + ID : 67 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1579,7 +1556,7 @@ Button bUp4 Button bPrev Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1633,7 +1610,7 @@ Button bPrev Button bNext Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1680,7 +1657,7 @@ Button bNext Button bText1 Attributes - ID : 37 + ID : 36 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1727,7 +1704,7 @@ Button bText1 Button bText2 Attributes - ID : 38 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1774,7 +1751,7 @@ Button bText2 Button bText3 Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1821,7 +1798,7 @@ Button bText3 Button bText4 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1868,7 +1845,7 @@ Button bText4 Button bStop5 Attributes - ID : 56 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1915,7 +1892,7 @@ Button bStop5 Button bDown5 Attributes - ID : 57 + ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1962,7 +1939,7 @@ Button bDown5 Button bUp5 Attributes - ID : 58 + ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2009,7 +1986,7 @@ Button bUp5 Button bText5 Attributes - ID : 60 + ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2236,7 +2213,7 @@ Dual-state Button btOnOff4 Dual-state Button btOnOff5 Attributes - ID : 59 + ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2281,7 +2258,7 @@ Dual-state Button btOnOff5 Hotspot mSpecial Attributes - ID : 35 + ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2307,7 +2284,7 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2342,7 +2319,7 @@ Hotspot m2 Hotspot m1 Attributes - ID : 42 + ID : 41 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2377,7 +2354,7 @@ Hotspot m1 Hotspot m0 Attributes - ID : 43 + ID : 42 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2412,7 +2389,7 @@ Hotspot m0 Hotspot m3 Attributes - ID : 44 + ID : 43 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2447,7 +2424,7 @@ Hotspot m3 Hotspot m4 Attributes - ID : 61 + ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2482,7 +2459,7 @@ Hotspot m4 Hotspot mSwipeNext Attributes - ID : 74 + ID : 73 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2502,7 +2479,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 75 + ID : 74 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2522,7 +2499,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 76 + ID : 75 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2542,7 +2519,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 30 + ID : 29 Scope : local Period (ms): 50 Enabled : yes @@ -3379,6 +3356,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -3488,7 +3466,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 36 + ID : 35 Scope : local Period (ms): 1000 Enabled : yes @@ -3519,7 +3497,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 53 + ID : 52 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 34ad3d1c..f1073b63 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -63,88 +63,95 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 14 + ID : 13 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 16 + ID : 15 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 19 + ID : 18 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 20 + ID : 19 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (string) type5 Attributes - ID : 34 + ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) type6 Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) entn5 Attributes - ID : 36 + ID : 35 Scope : local Text : Max. Text Size: 80 Variable (string) entn6 Attributes - ID : 37 + ID : 36 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 200 + Text tHeading Attributes ID : 2 @@ -205,39 +212,9 @@ Text tEntity1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 230 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 6 + ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -267,7 +244,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -297,7 +274,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -327,7 +304,7 @@ Text tId Text tEntity2 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -357,7 +334,7 @@ Text tEntity2 Text tEntity3 Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -387,7 +364,7 @@ Text tEntity3 Text tEntity4 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -417,7 +394,7 @@ Text tEntity4 Text tEntity5 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -447,7 +424,7 @@ Text tEntity5 Text tEntity6 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -494,7 +471,7 @@ Picture p0 Button bPrev Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -548,7 +525,7 @@ Button bPrev Button bNext Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -595,7 +572,7 @@ Button bNext Button bEntity1 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -653,7 +630,7 @@ Button bEntity1 Button bEntity2 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -711,7 +688,7 @@ Button bEntity2 Button bEntity3 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -769,7 +746,7 @@ Button bEntity3 Button bEntity4 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -827,7 +804,7 @@ Button bEntity4 Button bEntity5 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -885,7 +862,7 @@ Button bEntity5 Button bEntity6 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -943,7 +920,7 @@ Button bEntity6 Hotspot mSpecial Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -969,7 +946,7 @@ Hotspot mSpecial Hotspot mSwipeNext Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -989,7 +966,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1009,7 +986,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1029,7 +1006,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -1247,6 +1224,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -1356,7 +1334,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 13 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1387,7 +1365,7 @@ Timer tmSleep Timer tmLP Attributes - ID : 38 + ID : 37 Scope : local Period (ms): 500 Enabled : no @@ -1405,7 +1383,7 @@ Timer tmLP TouchCap tc0 Attributes - ID : 22 + ID : 21 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 489cf91d..f42de156 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -47,71 +47,48 @@ Page cardMedia Variable (string) strCommand Attributes - ID : 7 + ID : 6 Scope : local Text : Max. Text Size: 750 Variable (string) entn Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 80 Variable (string) vaSpeakerList Attributes - ID : 26 + ID : 25 Scope : local Text : Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes - ID : 27 + ID : 26 Scope: local Value: 0 Variable (string) vaMenu Attributes - ID : 33 + ID : 32 Scope : local Text : Max. Text Size: 50 -Text tSend +Variable (string) tSend Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 230 - Height : 15 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 200 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 33 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -141,7 +118,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -171,7 +148,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -201,7 +178,7 @@ Text tId Text tHeading Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +208,7 @@ Text tHeading Text tTitle Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -261,7 +238,7 @@ Text tTitle Text tAuthor Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -291,7 +268,7 @@ Text tAuthor Text t2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -340,7 +317,7 @@ Text t2 Text tPlayPause Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -389,7 +366,7 @@ Text tPlayPause Text t0 Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -438,7 +415,7 @@ Text t0 Text tIcon Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -486,7 +463,7 @@ Text tIcon Text t1 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -536,7 +513,7 @@ Text t1 Text t3 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -586,7 +563,7 @@ Text t3 Text t4 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -616,7 +593,7 @@ Text t4 Text tSpeaker Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -665,7 +642,7 @@ Text tSpeaker Text t6 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -707,7 +684,7 @@ Text t6 Text t5 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -773,7 +750,7 @@ Picture p0 Slider hVolume Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -819,7 +796,7 @@ Slider hVolume Button bNext Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -866,7 +843,7 @@ Button bNext Button bPrev Attributes - ID : 5 + ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -920,7 +897,7 @@ Button bPrev Hotspot mSwipeNext Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -940,7 +917,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -960,7 +937,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -980,7 +957,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 50 Enabled : yes @@ -1152,6 +1129,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -1232,7 +1210,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 18 + ID : 17 Scope : local Period (ms): 1000 Enabled : yes @@ -1263,7 +1241,7 @@ Timer tmSleep Timer tmCooldown Attributes - ID : 20 + ID : 19 Scope : local Period (ms): 100 Enabled : no @@ -1274,7 +1252,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 19 + ID : 18 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 24bcdf2e..8496a7d0 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -79,7 +79,7 @@ Variable (string) tSend ID : 10 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) tTmp Attributes @@ -948,6 +948,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index c9c4e60d..ff4cc09c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -161,7 +161,7 @@ Variable (string) tSend ID : 43 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 XFloat xTempDest1 Attributes @@ -315,7 +315,7 @@ XFloat xTempDest2 XFloat xTempDest Attributes - ID : 46 + ID : 45 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -523,39 +523,9 @@ Text tCF2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tALbl - Attributes - ID : 44 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 402 - Width : 83 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : Action - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tCF Attributes - ID : 48 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -585,7 +555,7 @@ Text tCF Text tCurTemp Attributes - ID : 49 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -739,10 +709,10 @@ Dual-state Button bt0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 106 - y coordinate : 378 - Width : 40 - Height : 40 + x coordinate : 36 + y coordinate : 359 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -788,10 +758,10 @@ Dual-state Button bt2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 196 - y coordinate : 378 - Width : 40 - Height : 40 + x coordinate : 168 + y coordinate : 359 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -837,10 +807,10 @@ Dual-state Button bt4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 106 + x coordinate : 36 y coordinate : 424 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -886,10 +856,10 @@ Dual-state Button bt6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 196 + x coordinate : 168 y coordinate : 424 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -935,10 +905,10 @@ Dual-state Button bt1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 151 - y coordinate : 378 - Width : 40 - Height : 40 + x coordinate : 102 + y coordinate : 359 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -984,10 +954,10 @@ Dual-state Button bt3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 241 - y coordinate : 378 - Width : 40 - Height : 40 + x coordinate : 234 + y coordinate : 359 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1033,10 +1003,10 @@ Dual-state Button bt5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 151 + x coordinate : 102 y coordinate : 424 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1082,10 +1052,10 @@ Dual-state Button bt7 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 241 + x coordinate : 234 y coordinate : 424 - Width : 40 - Height : 40 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1140,7 +1110,7 @@ Dual-state Button btUp1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1201,7 +1171,7 @@ Dual-state Button btDown1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1262,7 +1232,7 @@ Dual-state Button bUp2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1323,7 +1293,7 @@ Dual-state Button bDown2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1369,7 +1339,7 @@ Dual-state Button bDown2 Dual-state Button btUp Attributes - ID : 45 + ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1384,7 +1354,7 @@ Dual-state Button btUp Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1427,7 +1397,7 @@ Dual-state Button btUp Dual-state Button btDown Attributes - ID : 47 + ID : 46 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1442,7 +1412,7 @@ Dual-state Button btDown Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1485,7 +1455,7 @@ Dual-state Button btDown Hotspot mSwipeNext Attributes - ID : 50 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1505,7 +1475,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 51 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1525,7 +1495,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 52 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1787,7 +1757,7 @@ Timer tmSerial //Text tStateLbl spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",44 //Text tCF spstr strCommand.txt,tCF.txt,"~",45 tCF1.txt=tCF.txt @@ -1813,6 +1783,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 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 1949621f..776cc7cd 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 @@ -14,9 +14,9 @@ popupNotify 17 Component(s) 226 Line(s) of event code 143 Unique line(s) of event code -popupLight - 27 Component(s) - 386 Line(s) of event code +popupShutter + 25 Component(s) + 388 Line(s) of event code 211 Unique line(s) of event code pageStartup 19 Component(s) @@ -24,43 +24,43 @@ pageStartup 122 Unique line(s) of event code cardMedia 34 Component(s) - 388 Line(s) of event code - 209 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code -cardEntities - 77 Component(s) - 1348 Line(s) of event code - 599 Unique line(s) of event code -popupShutter - 25 Component(s) - 388 Line(s) of event code + 389 Line(s) of event code + 210 Unique line(s) of event code +popupLight + 27 Component(s) + 386 Line(s) of event code 211 Unique line(s) of event code +popupFan + 27 Component(s) + 313 Line(s) of event code + 180 Unique line(s) of event code +cardGrid + 42 Component(s) + 463 Line(s) of event code + 272 Unique line(s) of event code cardQR 32 Component(s) - 403 Line(s) of event code - 234 Unique line(s) of event code + 404 Line(s) of event code + 235 Unique line(s) of event code screensaver 38 Component(s) 341 Line(s) of event code 263 Unique line(s) of event code -cardGrid - 42 Component(s) - 462 Line(s) of event code - 271 Unique line(s) of event code cardAlarm 40 Component(s) - 421 Line(s) of event code - 254 Unique line(s) of event code + 422 Line(s) of event code + 255 Unique line(s) of event code cardThermo - 53 Component(s) + 52 Component(s) 580 Line(s) of event code 303 Unique line(s) of event code +cardEntities + 77 Component(s) + 1349 Line(s) of event code + 600 Unique line(s) of event code Total 14 Page(s) - 444 Component(s) - 5372 Line(s) of event code - 1432 Unique line(s) of event code + 450 Component(s) + 5454 Line(s) of event code + 1459 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupFan.txt b/HMI/US/portrait/n2t-out-visual/popupFan.txt index 599e21a5..9472c295 100644 --- a/HMI/US/portrait/n2t-out-visual/popupFan.txt +++ b/HMI/US/portrait/n2t-out-visual/popupFan.txt @@ -47,7 +47,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<20;sys0++) + for(sys0=0;sys0<24;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -69,30 +69,57 @@ Page popupFan Variable (string) strCommand Attributes - ID : 13 + ID : 12 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 16 + ID : 15 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 17 + ID : 16 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 18 + ID : 17 Scope: local Value: 0 +Variable (string) vaModeCur + Attributes + ID : 23 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeList + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vaModePos + Attributes + ID : 25 + Scope: local + Value: 0 + +Variable (string) tSend + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 2 @@ -183,39 +210,9 @@ Text t1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 19 - y coordinate : 2 - Width : 284 - Height : 8 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -245,7 +242,7 @@ Text tTmp Text tInstruction Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -275,7 +272,7 @@ Text tInstruction Text tId Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -412,6 +409,233 @@ Button b0 prints tSend.txt,0 prints crcval,2 +Button bMode1 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 29 + y coordinate : 256 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode2 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 169 + y coordinate : 255 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode3 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 29 + y coordinate : 330 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bModeNext + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 208 + y coordinate : 330 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + Dual-state Button btOnOff1 Attributes ID : 7 @@ -460,7 +684,7 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 11 + ID : 10 Scope : local Period (ms): 1000 Enabled : yes @@ -480,7 +704,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 12 + ID : 11 Scope : local Period (ms): 50 Enabled : yes @@ -677,7 +901,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 19 + ID : 18 Scope : local Period (ms): 100 Enabled : no @@ -688,7 +912,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 10 + ID : 9 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index a3cb4404..1433c6c7 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -84,30 +84,37 @@ Page popupLight Variable (string) strCommand Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 23 + ID : 22 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 24 + ID : 23 Scope: local Value: 0 +Variable (string) tSend + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 3 @@ -288,39 +295,9 @@ Text t4 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 5 - y coordinate : 5 - Width : 300 - Height : 7 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -350,7 +327,7 @@ Text tTmp Text tInstruction Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -380,7 +357,7 @@ Text tInstruction Text tId Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -410,7 +387,7 @@ Text tId Text t0 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -547,7 +524,7 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -639,7 +616,7 @@ Button b0 Button bColor Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -742,7 +719,7 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 15 + ID : 14 Scope : local Period (ms): 1000 Enabled : yes @@ -762,7 +739,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 16 + ID : 15 Scope : local Period (ms): 50 Enabled : yes @@ -1027,7 +1004,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 100 Enabled : no @@ -1038,7 +1015,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 14 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index f7a8f578..2f5dcb42 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -41,57 +41,34 @@ Page popupNotify Variable (string) strCommand Attributes - ID : 8 + ID : 7 Scope : local Text : Max. Text Size: 1000 Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 30 Variable (int32) vaOldSleepT Attributes - ID : 16 + ID : 15 Scope: local Value: 0 -Text tSend +Variable (string) tSend Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 300 - Height : 22 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 16 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -121,7 +98,7 @@ Text tTmp Text tInstruction Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -151,7 +128,7 @@ Text tInstruction Text tId Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -181,7 +158,7 @@ Text tId Text tHeading Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -211,7 +188,7 @@ Text tHeading Text tText Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -306,7 +283,7 @@ Button b0 Button b2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -355,7 +332,7 @@ Button b2 Button b1 Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -404,7 +381,7 @@ Button b1 Timer tmSleep Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 1000 Enabled : yes @@ -424,7 +401,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -647,7 +624,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 5 + ID : 4 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index a47eed09..36222b73 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -85,39 +85,46 @@ Page popupShutter Variable (string) strCommand Attributes - ID : 9 + ID : 8 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 80 Variable (string) tInstruction Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 20 Variable (string) tTmp Attributes - ID : 19 + ID : 18 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 2 @@ -178,39 +185,9 @@ Text tIcon1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 72 - Height : 22 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tPosHeading Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -240,7 +217,7 @@ Text tPosHeading Text tInfo1 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -270,7 +247,7 @@ Text tInfo1 Text tTiltHeading Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -317,7 +294,7 @@ Picture p0 Slider hPosition Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -361,7 +338,7 @@ Slider hPosition Slider hTilt Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -452,7 +429,7 @@ Button b0 Button bDown1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -499,7 +476,7 @@ Button bDown1 Button bStop1 Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -546,7 +523,7 @@ Button bStop1 Button bUp1 Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -593,7 +570,7 @@ Button bUp1 Button bTLeft Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -640,7 +617,7 @@ Button bTLeft Button bTStop Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -687,7 +664,7 @@ Button bTStop Button bTRight Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -734,7 +711,7 @@ Button bTRight Timer tmSleep Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 1000 Enabled : yes @@ -754,7 +731,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 8 + ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -1036,7 +1013,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 6 + ID : 5 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 4018e695..910af12c 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -73,7 +73,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) va1 Attributes @@ -780,6 +780,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 9f1071cd..7e4bcaf7 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -162,6 +162,12 @@ Variable (string) type5 Text : Max. Text Size: 10 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Number nNum1 Attributes Scope : local @@ -297,16 +303,6 @@ Text tIcon4 Text :  Max. Text Size : 5 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -2214,6 +2210,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index cb8a8847..521664fb 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -124,6 +124,12 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tHeading Attributes Scope : local @@ -144,16 +150,6 @@ Text tEntity1 Text : tEntity1 Max. Text Size : 30 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -783,6 +779,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index c1e67e37..f705403b 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -66,15 +66,11 @@ Variable (string) vaMenu Text : Max. Text Size: 50 -Text tSend +Variable (string) tSend Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 200 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes @@ -702,6 +698,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 62ad8746..7e2fc6a1 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -68,7 +68,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) tTmp Attributes @@ -649,6 +649,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index bac9c333..b6d86880 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -139,7 +139,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 XFloat xTempDest1 Attributes @@ -255,16 +255,6 @@ Text tCF2 Text :  Max. Text Size : 10 -Text tALbl - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Action - Max. Text Size : 30 - Text tCF Attributes Scope : local @@ -1069,7 +1059,7 @@ Timer tmSerial //Text tStateLbl spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",44 //Text tCF spstr strCommand.txt,tCF.txt,"~",45 tCF1.txt=tCF.txt @@ -1095,6 +1085,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/n2t-out/popupFan.txt b/HMI/US/portrait/n2t-out/popupFan.txt index bcce3670..29179544 100644 --- a/HMI/US/portrait/n2t-out/popupFan.txt +++ b/HMI/US/portrait/n2t-out/popupFan.txt @@ -39,7 +39,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<20;sys0++) + for(sys0=0;sys0<24;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -81,6 +81,29 @@ Variable (int32) mode_temp Scope: local Value: 0 +Variable (string) vaModeCur + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeList + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vaModePos + Attributes + Scope: local + Value: 0 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -111,16 +134,6 @@ Text t1 Text : Max. Text Size : 50 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -213,6 +226,145 @@ Button b0 prints tSend.txt,0 prints crcval,2 +Button bMode1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bModeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 5 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + Dual-state Button btOnOff1 Attributes Scope : local diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index cb0959db..718398aa 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -96,6 +96,12 @@ Variable (int32) mode_temp Scope: local Value: 0 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -156,16 +162,6 @@ Text t4 Text : Temperature Max. Text Size : 50 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index 393b540a..1276b257 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -48,15 +48,11 @@ Variable (int32) vaOldSleepT Scope: local Value: 0 -Text tSend +Variable (string) tSend Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 12468be5..b11f46c0 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -105,6 +105,12 @@ Variable (string) tTmp Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -125,16 +131,6 @@ Text tIcon1 Text :  Max. Text Size : 10 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tPosHeading Attributes Scope : local diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 96c94fc6..db8d6f96 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -84,7 +84,7 @@ Variable (string) tSend ID : 25 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) va1 Attributes @@ -1362,6 +1362,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index e401fd1d..6f7cda73 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -103,63 +103,70 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 41 + ID : 40 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 42 + ID : 41 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 43 + ID : 42 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 44 + ID : 43 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 45 + ID : 44 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 46 + ID : 45 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 47 + ID : 46 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 64 + Scope : local + Text : + Max. Text Size: 200 + Number nNum1 Attributes - ID : 54 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -189,7 +196,7 @@ Number nNum1 Number nNum2 Attributes - ID : 55 + ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -219,7 +226,7 @@ Number nNum2 Number nNum3 Attributes - ID : 56 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -249,7 +256,7 @@ Number nNum3 Number nNum4 Attributes - ID : 57 + ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -547,39 +554,9 @@ Text tIcon4 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 230 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -609,7 +586,7 @@ Text tTmp Text tInstruction Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -639,7 +616,7 @@ Text tInstruction Text tId Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -686,7 +663,7 @@ Picture p0 Slider hSlider1 Attributes - ID : 50 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -729,7 +706,7 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 51 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -772,7 +749,7 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 52 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -815,7 +792,7 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 53 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1422,7 +1399,7 @@ Button bUp4 Button bPrev Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1476,7 +1453,7 @@ Button bPrev Button bNext Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1523,7 +1500,7 @@ Button bNext Button bText1 Attributes - ID : 61 + ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1570,7 +1547,7 @@ Button bText1 Button bText2 Attributes - ID : 62 + ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1617,7 +1594,7 @@ Button bText2 Button bText3 Attributes - ID : 63 + ID : 62 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1664,7 +1641,7 @@ Button bText3 Button bText4 Attributes - ID : 64 + ID : 63 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1891,7 +1868,7 @@ Dual-state Button btOnOff4 Hotspot mSpecial Attributes - ID : 35 + ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1917,7 +1894,7 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 37 + ID : 36 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1952,7 +1929,7 @@ Hotspot m2 Hotspot m1 Attributes - ID : 38 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1987,7 +1964,7 @@ Hotspot m1 Hotspot m0 Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2022,7 +1999,7 @@ Hotspot m0 Hotspot m3 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2057,7 +2034,7 @@ Hotspot m3 Hotspot mSwipeNext Attributes - ID : 58 + ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2077,7 +2054,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 59 + ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2097,7 +2074,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 60 + ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2117,7 +2094,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 30 + ID : 29 Scope : local Period (ms): 50 Enabled : yes @@ -2805,6 +2782,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -2914,7 +2892,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 36 + ID : 35 Scope : local Period (ms): 1000 Enabled : yes @@ -2945,7 +2923,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 49 + ID : 48 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 96ef28b1..abdac93d 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -63,88 +63,95 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 14 + ID : 13 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 16 + ID : 15 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 19 + ID : 18 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 20 + ID : 19 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (string) type5 Attributes - ID : 34 + ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) type6 Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) entn5 Attributes - ID : 36 + ID : 35 Scope : local Text : Max. Text Size: 80 Variable (string) entn6 Attributes - ID : 37 + ID : 36 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 200 + Text tHeading Attributes ID : 2 @@ -205,39 +212,9 @@ Text tEntity1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 230 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 6 + ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -267,7 +244,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -297,7 +274,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -327,7 +304,7 @@ Text tId Text tEntity2 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -357,7 +334,7 @@ Text tEntity2 Text tEntity3 Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -387,7 +364,7 @@ Text tEntity3 Text tEntity4 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -417,7 +394,7 @@ Text tEntity4 Text tEntity5 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -447,7 +424,7 @@ Text tEntity5 Text tEntity6 Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -494,7 +471,7 @@ Picture p0 Button bPrev Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -548,7 +525,7 @@ Button bPrev Button bNext Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -595,7 +572,7 @@ Button bNext Button bEntity1 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -653,7 +630,7 @@ Button bEntity1 Button bEntity2 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -711,7 +688,7 @@ Button bEntity2 Button bEntity3 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -769,7 +746,7 @@ Button bEntity3 Button bEntity4 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -827,7 +804,7 @@ Button bEntity4 Button bEntity5 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -885,7 +862,7 @@ Button bEntity5 Button bEntity6 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -943,7 +920,7 @@ Button bEntity6 Hotspot mSpecial Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -969,7 +946,7 @@ Hotspot mSpecial Hotspot mSwipeNext Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -989,7 +966,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1009,7 +986,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1029,7 +1006,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -1247,6 +1224,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -1356,7 +1334,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 13 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1387,7 +1365,7 @@ Timer tmSleep Timer tmLP Attributes - ID : 38 + ID : 37 Scope : local Period (ms): 500 Enabled : no @@ -1405,7 +1383,7 @@ Timer tmLP TouchCap tc0 Attributes - ID : 22 + ID : 21 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index cb66a40b..406775d7 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -47,71 +47,48 @@ Page cardMedia Variable (string) strCommand Attributes - ID : 7 + ID : 6 Scope : local Text : Max. Text Size: 750 Variable (string) entn Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 80 Variable (string) vaSpeakerList Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 400 Variable (int32) vaSpeakerPos Attributes - ID : 28 + ID : 27 Scope: local Value: 0 Variable (string) vaMenu Attributes - ID : 33 + ID : 32 Scope : local Text : Max. Text Size: 50 -Text tSend +Variable (string) tSend Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 230 - Height : 15 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 200 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 33 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -141,7 +118,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -171,7 +148,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -201,7 +178,7 @@ Text tId Text tHeading Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +208,7 @@ Text tHeading Text tTitle Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -261,7 +238,7 @@ Text tTitle Text tAuthor Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -291,7 +268,7 @@ Text tAuthor Text t2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -340,7 +317,7 @@ Text t2 Text tPlayPause Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -389,7 +366,7 @@ Text tPlayPause Text t0 Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -438,7 +415,7 @@ Text t0 Text tIcon Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -486,7 +463,7 @@ Text tIcon Text t1 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -536,7 +513,7 @@ Text t1 Text t3 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -586,7 +563,7 @@ Text t3 Text t4 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -616,7 +593,7 @@ Text t4 Text tSpeaker Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -665,7 +642,7 @@ Text tSpeaker Text t6 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -707,7 +684,7 @@ Text t6 Text t5 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -773,7 +750,7 @@ Picture p0 Slider hVolume Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -819,7 +796,7 @@ Slider hVolume Button bNext Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -866,7 +843,7 @@ Button bNext Button bPrev Attributes - ID : 5 + ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -920,7 +897,7 @@ Button bPrev Hotspot mSwipeNext Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -940,7 +917,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -960,7 +937,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -980,7 +957,7 @@ Hotspot mSwipePrev Timer tmSerial Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 50 Enabled : yes @@ -1152,6 +1129,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 @@ -1232,7 +1210,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 + ID : 18 Scope : local Period (ms): 1000 Enabled : yes @@ -1263,7 +1241,7 @@ Timer tmSleep Timer tmCooldown Attributes - ID : 21 + ID : 20 Scope : local Period (ms): 100 Enabled : no @@ -1274,7 +1252,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 20 + ID : 19 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt new file mode 100644 index 00000000..0737e509 --- /dev/null +++ b/HMI/n2t-out-visual/cardPower.txt @@ -0,0 +1,1500 @@ +Page cardPower + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + tsw h0,0 + tsw h1,0 + tsw h2,0 + tsw h3,0 + tsw h4,0 + tsw h5,0 + +Variable (string) strCommand + Attributes + ID : 5 + Scope : local + Text : + Max. Text Size: 275 + +Variable (string) tSend + Attributes + ID : 8 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 20 + +Variable (int32) t0Speed + Attributes + ID : 42 + Scope: local + Value: 0 + +Variable (int32) t1Speed + Attributes + ID : 43 + Scope: local + Value: 0 + +Variable (int32) t3Speed + Attributes + ID : 44 + Scope: local + Value: 0 + +Variable (int32) t4Speed + Attributes + ID : 45 + Scope: local + Value: 0 + +Variable (int32) t5Speed + Attributes + ID : 46 + Scope: local + Value: 0 + +Variable (int32) t2Speed + Attributes + ID : 47 + Scope: local + Value: 0 + +Text tHeading + Attributes + ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 320 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t4Icon + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 378 + y coordinate : 156 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t5Icon + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 378 + y coordinate : 232 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t0Icon + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 18 + y coordinate : 80 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 1024 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2Icon + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 18 + y coordinate : 232 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1Icon + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 18 + y coordinate : 156 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 65504 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 198 + y coordinate : 70 + Width : 60 + Height : 230 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3Icon + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 378 + y coordinate : 80 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t0u + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 117 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t0o + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 70 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1u + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 194 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1o + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 147 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2o + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 224 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2u + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 271 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t5u + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 271 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t5o + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 224 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t4u + Attributes + ID : 38 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 194 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t4o + Attributes + ID : 39 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 147 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3u + Attributes + ID : 40 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 117 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3o + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 70 + Width : 108 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Slider h1 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 165 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h4 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 258 + y coordinate : 165 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h0 + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 88 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h2 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 241 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h5 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 258 + y coordinate : 241 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h3 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 258 + y coordinate : 88 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Button bNext + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 391 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + 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 + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //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 + +Button bPrev + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + 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 + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Hotspot mSwipeNext + Attributes + ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 440 + y coordinate : 5 + Width : 39 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipeUp + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipePrev + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos=100&&h0.val<=150) + { + h0.val=0 + } + if(h1.val>=100&&h1.val<=150) + { + h1.val=0 + } + if(h2.val>=100&&h2.val<=150) + { + h2.val=0 + } + if(h3.val>=100&&h3.val<=150) + { + h3.val=0 + } + if(h4.val>=100&&h4.val<=150) + { + h4.val=0 + } + if(h5.val>=100&&h5.val<=150) + { + h5.val=0 + } + ref t0o + ref t0u + ref t1o + ref t1u + ref t2o + ref t2u + ref t3o + ref t3u + ref t4o + ref t4u + ref t5o + ref t5u + +TouchCap tc0 + Attributes + ID : 7 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 472b2c98..bab05059 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -79,7 +79,7 @@ Variable (string) tSend ID : 10 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) tTmp Attributes @@ -948,6 +948,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 91265578..0aea62b5 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -161,7 +161,7 @@ Variable (string) tSend ID : 46 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 XFloat xTempDest1 Attributes @@ -315,7 +315,7 @@ XFloat xTempDest2 XFloat xTempDest Attributes - ID : 49 + ID : 48 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -523,39 +523,9 @@ Text tCF2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tALbl - Attributes - ID : 47 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 7 - y coordinate : 260 - Width : 74 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : Action - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tCF Attributes - ID : 51 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -585,7 +555,7 @@ Text tCF Text tCurTemp Attributes - ID : 52 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -739,16 +709,16 @@ Dual-state Button bt0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 82 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 12 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -788,16 +758,16 @@ Dual-state Button bt2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 172 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 120 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -837,16 +807,16 @@ Dual-state Button bt4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 262 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 228 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -886,16 +856,16 @@ Dual-state Button bt6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 352 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 336 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -935,16 +905,16 @@ Dual-state Button bt1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 127 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 66 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -984,16 +954,16 @@ Dual-state Button bt3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 217 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 174 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1033,16 +1003,16 @@ Dual-state Button bt5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 307 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 282 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1082,16 +1052,16 @@ Dual-state Button bt7 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 397 - y coordinate : 255 - Width : 40 - Height : 40 + x coordinate : 390 + y coordinate : 254 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1140,7 +1110,7 @@ Dual-state Button btUp1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1201,7 +1171,7 @@ Dual-state Button btDown1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1262,7 +1232,7 @@ Dual-state Button bUp2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1323,7 +1293,7 @@ Dual-state Button bDown2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1369,7 +1339,7 @@ Dual-state Button bDown2 Dual-state Button btUp Attributes - ID : 48 + ID : 47 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1384,7 +1354,7 @@ Dual-state Button btUp Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1427,7 +1397,7 @@ Dual-state Button btUp Dual-state Button btDown Attributes - ID : 50 + ID : 49 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1442,7 +1412,7 @@ Dual-state Button btDown Effect Time : 300 Fill : solid color Style : flat - Font ID : 1 + Font ID : 3 Back. Color (Unpressed) : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 @@ -1787,7 +1757,7 @@ Timer tmSerial //Text tStateLbl spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",44 //Text tCF spstr strCommand.txt,tCF.txt,"~",45 tCF1.txt=tCF.txt @@ -1813,6 +1783,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 7a9dd67a..6c9c7cdb 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -6,10 +6,14 @@ pageIcons 6 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +popupFan + 27 Component(s) + 342 Line(s) of event code + 199 Unique line(s) of event code pageTest - 19 Component(s) - 64 Line(s) of event code - 61 Unique line(s) of event code + 20 Component(s) + 65 Line(s) of event code + 62 Unique line(s) of event code pageStartup 19 Component(s) 167 Line(s) of event code @@ -18,49 +22,49 @@ popupShutter 25 Component(s) 388 Line(s) of event code 211 Unique line(s) of event code -popupNotify - 17 Component(s) - 226 Line(s) of event code - 143 Unique line(s) of event code popupLight 27 Component(s) 386 Line(s) of event code 211 Unique line(s) of event code -cardMedia - 34 Component(s) - 388 Line(s) of event code - 209 Unique line(s) of event code cardGrid 42 Component(s) - 462 Line(s) of event code - 271 Unique line(s) of event code -popupFan - 20 Component(s) - 236 Line(s) of event code - 150 Unique line(s) of event code -cardQR - 32 Component(s) - 403 Line(s) of event code - 234 Unique line(s) of event code -cardAlarm - 40 Component(s) - 421 Line(s) of event code - 254 Unique line(s) of event code + 463 Line(s) of event code + 272 Unique line(s) of event code +cardMedia + 34 Component(s) + 389 Line(s) of event code + 210 Unique line(s) of event code screensaver 38 Component(s) 341 Line(s) of event code 263 Unique line(s) of event code +cardAlarm + 40 Component(s) + 422 Line(s) of event code + 255 Unique line(s) of event code +cardQR + 32 Component(s) + 404 Line(s) of event code + 235 Unique line(s) of event code +popupNotify + 17 Component(s) + 226 Line(s) of event code + 143 Unique line(s) of event code +cardPower + 48 Component(s) + 387 Line(s) of event code + 279 Unique line(s) of event code cardThermo - 53 Component(s) + 52 Component(s) 580 Line(s) of event code 303 Unique line(s) of event code cardEntities 65 Component(s) - 1127 Line(s) of event code - 514 Unique line(s) of event code + 1128 Line(s) of event code + 515 Unique line(s) of event code Total - 14 Page(s) - 437 Component(s) - 5202 Line(s) of event code - 1373 Unique line(s) of event code + 15 Page(s) + 492 Component(s) + 5701 Line(s) of event code + 1546 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 685b8ebb..209f1253 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 41 + Text : 42 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index fdf0241b..e8cc6c6d 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -525,6 +525,42 @@ Button b2 Touch Press Event page cardQR +Button b12 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 242 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 1 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : power + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardPower + Timer tmSerial Attributes ID : 14 diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index 8fec99b0..54172b3f 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -47,7 +47,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<20;sys0++) + for(sys0=0;sys0<24;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -69,30 +69,57 @@ Page popupFan Variable (string) strCommand Attributes - ID : 13 + ID : 12 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 16 + ID : 15 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 17 + ID : 16 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 18 + ID : 17 Scope: local Value: 0 +Variable (int32) vaModePos + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (string) vaModeList + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur + Attributes + ID : 25 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) tSend + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 2 @@ -183,7 +210,7 @@ Text t1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tTmp Attributes ID : 8 Scope : local @@ -191,39 +218,9 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 348 - Height : 7 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tTmp - Attributes - ID : 9 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 406 + x coordinate : 343 y coordinate : 277 - Width : 34 + Width : 97 Height : 30 Effect : load Effect Priority : 0 @@ -245,7 +242,7 @@ Text tTmp Text tInstruction Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -275,7 +272,7 @@ Text tInstruction Text tId Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -412,6 +409,233 @@ Button b0 prints tSend.txt,0 prints crcval,2 +Button bMode1 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 213 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode3 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 259 + y coordinate : 213 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode2 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 213 + Width : 120 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bModeNext + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 388 + y coordinate : 213 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + Dual-state Button btOnOff1 Attributes ID : 7 @@ -460,7 +684,7 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 11 + ID : 10 Scope : local Period (ms): 1000 Enabled : yes @@ -480,7 +704,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 12 + ID : 11 Scope : local Period (ms): 50 Enabled : yes @@ -565,6 +789,37 @@ Timer tmSerial covx tTmp.txt,hSpeed.maxval,0,0 // set t1 Speed (Localization) spstr strCommand.txt,t1.txt,"~",7 + //current mode + spstr strCommand.txt,vaModeCur.txt,"~",8 + //mode list + spstr strCommand.txt,vaModeList.txt,"~",9 + if(vaModeList.txt=="") + { + vis bMode1,0 + vis bMode2,0 + vis bMode3,0 + vis bModeNext,0 + } + if(bMode1.txt=="") + { + click bModeNext,1 + click bModeNext,0 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } } if(tInstruction.txt=="time") { @@ -677,7 +932,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 19 + ID : 18 Scope : local Period (ms): 100 Enabled : no @@ -688,7 +943,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 10 + ID : 9 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 35290e65..f1d85bc3 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -84,30 +84,37 @@ Page popupLight Variable (string) strCommand Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 23 + ID : 22 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 24 + ID : 23 Scope: local Value: 0 +Variable (string) tSend + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 3 @@ -288,39 +295,9 @@ Text t4 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 348 - Height : 7 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tTmp Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -350,7 +327,7 @@ Text tTmp Text tInstruction Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -380,7 +357,7 @@ Text tInstruction Text tId Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -410,7 +387,7 @@ Text tId Text t0 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -547,7 +524,7 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -639,7 +616,7 @@ Button b0 Button bColor Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -742,7 +719,7 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 15 + ID : 14 Scope : local Period (ms): 1000 Enabled : yes @@ -762,7 +739,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 16 + ID : 15 Scope : local Period (ms): 50 Enabled : yes @@ -1027,7 +1004,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 100 Enabled : no @@ -1038,7 +1015,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 14 + ID : 13 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 134e3589..9ef65aab 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -41,57 +41,34 @@ Page popupNotify Variable (string) strCommand Attributes - ID : 8 + ID : 7 Scope : local Text : Max. Text Size: 1000 Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 30 Variable (int32) vaOldSleepT Attributes - ID : 16 + ID : 15 Scope: local Value: 0 -Text tSend +Variable (string) tSend Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 348 - Height : 22 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 16 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -121,7 +98,7 @@ Text tTmp Text tInstruction Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -151,7 +128,7 @@ Text tInstruction Text tId Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -181,7 +158,7 @@ Text tId Text tHeading Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -211,7 +188,7 @@ Text tHeading Text tText Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -306,7 +283,7 @@ Button b0 Button b2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -355,7 +332,7 @@ Button b2 Button b1 Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -404,7 +381,7 @@ Button b1 Timer tmSleep Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 1000 Enabled : yes @@ -424,7 +401,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -647,7 +624,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 5 + ID : 4 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index e1960332..dd96ab63 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -85,39 +85,46 @@ Page popupShutter Variable (string) strCommand Attributes - ID : 9 + ID : 8 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 15 + ID : 14 Scope : local Text : Max. Text Size: 80 Variable (string) tInstruction Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 20 Variable (string) tId Attributes - ID : 18 + ID : 17 Scope : local Text : Max. Text Size: 20 Variable (string) tTmp Attributes - ID : 19 + ID : 18 Scope : local Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes ID : 2 @@ -178,39 +185,9 @@ Text tIcon1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 348 - Height : 22 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : newtxt - Max. Text Size : 100 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tPosHeading Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -240,7 +217,7 @@ Text tPosHeading Text tInfo1 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -270,7 +247,7 @@ Text tInfo1 Text tTiltHeading Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -317,7 +294,7 @@ Picture p0 Slider hPosition Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -361,7 +338,7 @@ Slider hPosition Slider hTilt Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -452,7 +429,7 @@ Button b0 Button bDown1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -499,7 +476,7 @@ Button bDown1 Button bStop1 Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -546,7 +523,7 @@ Button bStop1 Button bUp1 Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -593,7 +570,7 @@ Button bUp1 Button bTLeft Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -640,7 +617,7 @@ Button bTLeft Button bTStop Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -687,7 +664,7 @@ Button bTStop Button bTRight Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -734,7 +711,7 @@ Button bTRight Timer tmSleep Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 1000 Enabled : yes @@ -754,7 +731,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 8 + ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -1036,7 +1013,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 6 + ID : 5 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 4018e695..910af12c 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -73,7 +73,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) va1 Attributes @@ -780,6 +780,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 80d545c3..6b98a6b0 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -140,6 +140,12 @@ Variable (string) entn4 Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Number nNum1 Attributes Scope : local @@ -266,16 +272,6 @@ Text tIcon4 Text :  Max. Text Size : 5 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -1833,6 +1829,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index cb8a8847..521664fb 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -124,6 +124,12 @@ Variable (string) entn6 Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tHeading Attributes Scope : local @@ -144,16 +150,6 @@ Text tEntity1 Text : tEntity1 Max. Text Size : 30 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -783,6 +779,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index c1e67e37..f705403b 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -66,15 +66,11 @@ Variable (string) vaMenu Text : Max. Text Size: 50 -Text tSend +Variable (string) tSend Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 200 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes @@ -702,6 +698,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt new file mode 100644 index 00000000..5a25e36b --- /dev/null +++ b/HMI/n2t-out/cardPower.txt @@ -0,0 +1,892 @@ +Page cardPower + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + tsw h0,0 + tsw h1,0 + tsw h2,0 + tsw h3,0 + tsw h4,0 + tsw h5,0 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 275 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (int32) t0Speed + Attributes + Scope: local + Value: 0 + +Variable (int32) t1Speed + Attributes + Scope: local + Value: 0 + +Variable (int32) t3Speed + Attributes + Scope: local + Value: 0 + +Variable (int32) t4Speed + Attributes + Scope: local + Value: 0 + +Variable (int32) t5Speed + Attributes + Scope: local + Value: 0 + +Variable (int32) t2Speed + Attributes + Scope: local + Value: 0 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Text t4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t0Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text t0u + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t0o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t1u + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t1o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t2o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t2u + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t5u + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t5o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t4u + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t4o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t3u + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text t3o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Slider h1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h4 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Button bNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //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 + +Button bPrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos=100&&h0.val<=150) + { + h0.val=0 + } + if(h1.val>=100&&h1.val<=150) + { + h1.val=0 + } + if(h2.val>=100&&h2.val<=150) + { + h2.val=0 + } + if(h3.val>=100&&h3.val<=150) + { + h3.val=0 + } + if(h4.val>=100&&h4.val<=150) + { + h4.val=0 + } + if(h5.val>=100&&h5.val<=150) + { + h5.val=0 + } + ref t0o + ref t0u + ref t1o + ref t1u + ref t2o + ref t2u + ref t3o + ref t3u + ref t4o + ref t4u + ref t5o + ref t5u + +TouchCap tc0 + Attributes + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 62ad8746..7e2fc6a1 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -68,7 +68,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 Variable (string) tTmp Attributes @@ -649,6 +649,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index bac9c333..b6d86880 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -139,7 +139,7 @@ Variable (string) tSend Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 200 XFloat xTempDest1 Attributes @@ -255,16 +255,6 @@ Text tCF2 Text :  Max. Text Size : 10 -Text tALbl - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Action - Max. Text Size : 30 - Text tCF Attributes Scope : local @@ -1069,7 +1059,7 @@ Timer tmSerial //Text tStateLbl spstr strCommand.txt,tStateLbl.txt,"~",43 //Text tALbl - spstr strCommand.txt,tALbl.txt,"~",44 + //spstr strCommand.txt,tALbl.txt,"~",44 //Text tCF spstr strCommand.txt,tCF.txt,"~",45 tCF1.txt=tCF.txt @@ -1095,6 +1085,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepValue=0 //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 210d4f57..75a9f5f2 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 41 + Text : 42 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index a2a10692..48071982 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -220,6 +220,20 @@ Button b2 Touch Press Event page cardQR +Button b12 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : power + Max. Text Size : 10 + + Events + Touch Press Event + page cardPower + Timer tmSerial Attributes Scope : local diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index bcce3670..35bb0d7e 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -39,7 +39,7 @@ Page popupFan prints crcval,2 vis hSpeed,0 popupFan.bco=defaultBcoColor - for(sys0=0;sys0<20;sys0++) + for(sys0=0;sys0<24;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -81,6 +81,29 @@ Variable (int32) mode_temp Scope: local Value: 0 +Variable (int32) vaModePos + Attributes + Scope: local + Value: 0 + +Variable (string) vaModeList + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -111,16 +134,6 @@ Text t1 Text : Max. Text Size : 50 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local @@ -213,6 +226,145 @@ Button b0 prints tSend.txt,0 prints crcval,2 +Button bMode1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bMode2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-sel,"+tTmp.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 + +Button bModeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 5 + + Events + Touch Press Event + //if(bMode3.txt=="") + spstr vaModeList.txt,tTmp.txt,"?",vaModePos.val + if(tTmp.txt=="") + { + vaModePos.val=0 + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + } + spstr vaModeList.txt,bMode1.txt,"?",vaModePos.val + spstr vaModeList.txt,bMode2.txt,"?",vaModePos.val+1 + spstr vaModeList.txt,bMode3.txt,"?",vaModePos.val+2 + vaModePos.val+=3 + spstr vaModeList.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis bModeNext,0 + }else + { + vis bModeNext,1 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } + Dual-state Button btOnOff1 Attributes Scope : local @@ -346,6 +498,37 @@ Timer tmSerial covx tTmp.txt,hSpeed.maxval,0,0 // set t1 Speed (Localization) spstr strCommand.txt,t1.txt,"~",7 + //current mode + spstr strCommand.txt,vaModeCur.txt,"~",8 + //mode list + spstr strCommand.txt,vaModeList.txt,"~",9 + if(vaModeList.txt=="") + { + vis bMode1,0 + vis bMode2,0 + vis bMode3,0 + vis bModeNext,0 + } + if(bMode1.txt=="") + { + click bModeNext,1 + click bModeNext,0 + } + bMode1.pco=defaultFontColor + bMode2.pco=defaultFontColor + bMode3.pco=defaultFontColor + if(bMode1.txt==vaModeCur.txt) + { + bMode1.pco=1374 + } + if(bMode2.txt==vaModeCur.txt) + { + bMode2.pco=1374 + } + if(bMode3.txt==vaModeCur.txt) + { + bMode3.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index cb0959db..718398aa 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -96,6 +96,12 @@ Variable (int32) mode_temp Scope: local Value: 0 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -156,16 +162,6 @@ Text t4 Text : Temperature Max. Text Size : 50 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tTmp Attributes Scope : local diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 393b540a..1276b257 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -48,15 +48,11 @@ Variable (int32) vaOldSleepT Scope: local Value: 0 -Text tSend +Variable (string) tSend Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 + Scope : local + Text : + Max. Text Size: 200 Text tTmp Attributes diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 12468be5..b11f46c0 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -105,6 +105,12 @@ Variable (string) tTmp Text : Max. Text Size: 80 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + Text tEntity Attributes Scope : local @@ -125,16 +131,6 @@ Text tIcon1 Text :  Max. Text Size : 10 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : newtxt - Max. Text Size : 100 - Text tPosHeading Attributes Scope : local