From 9a0e4982fbe0d0ff4ce8e3f99826ada1b8b2c974 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 29 Mar 2022 09:55:01 +0000 Subject: [PATCH] fix ignore id file (add nextion2text) --- HMI/US/portrait/diff-eu-version.txt | 323 +++++---------------- HMI/US/portrait/n2t-out/cardAlarm.txt | 35 --- HMI/US/portrait/n2t-out/cardEntities.txt | 80 ----- HMI/US/portrait/n2t-out/cardGrid.txt | 39 --- HMI/US/portrait/n2t-out/cardMedia.txt | 30 -- HMI/US/portrait/n2t-out/cardThermo.txt | 42 --- HMI/US/portrait/n2t-out/pageIcons.txt | 6 - HMI/US/portrait/n2t-out/pageSerialTest.txt | 13 - HMI/US/portrait/n2t-out/pageStartup.txt | 19 -- HMI/US/portrait/n2t-out/pageTest.txt | 13 - HMI/US/portrait/n2t-out/popupLight.txt | 26 -- HMI/US/portrait/n2t-out/popupNotify.txt | 17 -- HMI/US/portrait/n2t-out/popupShutter.txt | 19 -- HMI/US/portrait/n2t-out/screensaver.txt | 31 -- HMI/n2t-out/cardAlarm.txt | 35 --- HMI/n2t-out/cardEntities.txt | 62 ---- HMI/n2t-out/cardGrid.txt | 39 --- HMI/n2t-out/cardMedia.txt | 30 -- HMI/n2t-out/cardThermo.txt | 42 --- HMI/n2t-out/pageIcons.txt | 6 - HMI/n2t-out/pageSerialTest.txt | 13 - HMI/n2t-out/pageStartup.txt | 19 -- HMI/n2t-out/pageTest.txt | 13 - HMI/n2t-out/popupLight.txt | 27 -- HMI/n2t-out/popupNotify.txt | 17 -- HMI/n2t-out/popupShutter.txt | 19 -- HMI/n2t-out/screensaver.txt | 31 -- 27 files changed, 70 insertions(+), 976 deletions(-) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5b1f31f5..f0e96420 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-03-29 09:00:45.659455717 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 09:00:46.159475076 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-29 09:55:00.533431443 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 09:55:01.025440103 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -11,9 +11,9 @@ 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-03-29 09:00:45.659455717 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 09:00:46.159475076 +0000 -@@ -32,7 +32,6 @@ +--- HMI/n2t-out/cardEntities.txt 2022-03-29 09:55:00.537431470 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 09:55:01.025440103 +0000 +@@ -31,7 +31,6 @@ vis tEntity1,0 vis bText1,0 vis hSlider1,0 @@ -21,7 +21,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //ui e2 vis btOnOff2,0 vis bUp2,0 -@@ -42,7 +41,6 @@ +@@ -41,7 +40,6 @@ vis tEntity2,0 vis bText2,0 vis hSlider2,0 @@ -29,7 +29,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //ui e3 vis btOnOff3,0 vis bUp3,0 -@@ -52,7 +50,6 @@ +@@ -51,7 +49,6 @@ vis tEntity3,0 vis bText3,0 vis hSlider3,0 @@ -37,7 +37,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //ui e4 vis btOnOff4,0 vis bUp4,0 -@@ -62,7 +59,24 @@ +@@ -61,7 +58,24 @@ vis tEntity4,0 vis bText4,0 vis hSlider4,0 @@ -63,15 +63,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Variable (string) strCommand Attributes -@@ -127,45 +141,33 @@ +@@ -117,41 +131,29 @@ Text : Max. Text Size: 70 -Number nNum1 +Variable (string) entn5 Attributes -- ID : 58 -+ ID : 70 Scope : local - Dragging : 0 - Disable release event after dragging: 0 @@ -84,8 +82,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt -Number nNum2 +Variable (string) entn6 Attributes -- ID : 59 -+ ID : 71 Scope : local - Dragging : 0 - Disable release event after dragging: 0 @@ -98,8 +94,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt -Number nNum3 +Variable (string) type5 Attributes -- ID : 60 -+ ID : 72 Scope : local - Dragging : 0 - Disable release event after dragging: 0 @@ -112,8 +106,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt -Number nNum4 +Variable (string) type6 Attributes -- ID : 61 -+ ID : 73 Scope : local - Dragging : 0 - Disable release event after dragging: 0 @@ -125,13 +117,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Text tHeading Attributes -@@ -310,6 +312,50 @@ +@@ -283,6 +285,46 @@ Text : Max. Text Size : 50 +Text tEntity5 + Attributes -+ ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -142,7 +133,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Text tIcon5 + Attributes -+ ID : 55 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -153,7 +143,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Text tEntity6 + Attributes -+ ID : 62 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -164,7 +153,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Text tIcon6 + Attributes -+ ID : 63 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -175,51 +163,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Picture p0 Attributes - ID : 1 -@@ -320,7 +366,7 @@ - - Slider hSlider1 - Attributes -- ID : 54 -+ ID : 74 Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -331,7 +377,7 @@ +@@ -330,6 +372,26 @@ + Upper range limit : 100 + Lower range limit : 0 - Slider hSlider2 - Attributes -- ID : 55 -+ ID : 75 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -342,7 +388,7 @@ - - Slider hSlider3 - Attributes -- ID : 56 -+ ID : 76 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -353,7 +399,29 @@ - - Slider hSlider4 - Attributes -- ID : 57 -+ ID : 77 -+ 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 hSlider5 + Attributes -+ ID : 78 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -230,17 +180,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Slider hSlider6 + Attributes -+ ID : 79 ++ 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 bDown1 + Attributes Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -830,6 +898,214 @@ +@@ -780,6 +842,206 @@ prints tSend.txt,0 prints crcval,2 +Button bStop5 + Attributes -+ ID : 56 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -266,7 +222,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bDown5 + Attributes -+ ID : 57 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -292,7 +247,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bUp5 + Attributes -+ ID : 58 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -318,7 +272,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bText5 + Attributes -+ ID : 60 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -344,7 +297,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bStop6 + Attributes -+ ID : 64 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -370,7 +322,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bDown6 + Attributes -+ ID : 65 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -396,7 +347,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bUp6 + Attributes -+ ID : 66 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -422,7 +372,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Button bText6 + Attributes -+ ID : 68 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -448,14 +397,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Dual-state Button btOnOff1 Attributes - ID : 23 -@@ -942,6 +1218,62 @@ + Scope : local +@@ -888,6 +1150,60 @@ prints tSend.txt,0 prints crcval,2 +Dual-state Button btOnOff5 + Attributes -+ ID : 59 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -483,7 +431,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Dual-state Button btOnOff6 + Attributes -+ ID : 67 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -511,14 +458,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Hotspot mSpecial Attributes - ID : 35 -@@ -1052,6 +1384,52 @@ + Scope : local +@@ -993,6 +1309,50 @@ page popupLight } +Hotspot m4 + Attributes -+ ID : 61 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -541,7 +487,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + +Hotspot m5 + Attributes -+ ID : 69 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -564,8 +509,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Timer tmSerial Attributes - ID : 30 -@@ -1122,7 +1500,6 @@ + Scope : local +@@ -1062,7 +1422,6 @@ vis tIcon1,0 vis bText1,0 vis hSlider1,0 @@ -573,7 +518,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt }else { // change icon -@@ -1146,7 +1523,6 @@ +@@ -1086,7 +1445,6 @@ vis btOnOff1,0 vis bText1,0 vis hSlider1,0 @@ -581,7 +526,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(type1.txt=="light") { -@@ -1156,7 +1532,6 @@ +@@ -1096,7 +1454,6 @@ vis btOnOff1,1 vis bText1,0 vis hSlider1,0 @@ -589,7 +534,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,sys0,0,0 -@@ -1170,7 +1545,6 @@ +@@ -1110,7 +1467,6 @@ vis btOnOff1,1 vis bText1,0 vis hSlider1,0 @@ -597,7 +542,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,sys0,0,0 -@@ -1185,7 +1559,6 @@ +@@ -1125,7 +1481,6 @@ vis bText1,1 tsw bText1,0 vis hSlider1,0 @@ -605,7 +550,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) -@@ -1200,7 +1573,6 @@ +@@ -1140,7 +1495,6 @@ vis bText1,1 tsw bText1,1 vis hSlider1,0 @@ -613,7 +558,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) -@@ -1215,14 +1587,12 @@ +@@ -1155,14 +1509,12 @@ vis bText1,0 tsw bText1,0 vis hSlider1,1 @@ -628,7 +573,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //second value is min value spstr bText1.txt,tTmp.txt,"|",2 covx tTmp.txt,sys0,0,0 -@@ -1246,7 +1616,6 @@ +@@ -1186,7 +1538,6 @@ vis tIcon2,0 vis bText2,0 vis hSlider2,0 @@ -636,7 +581,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt }else { // change icon -@@ -1270,7 +1639,6 @@ +@@ -1210,7 +1561,6 @@ vis btOnOff2,0 vis bText2,0 vis hSlider2,0 @@ -644,7 +589,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(type2.txt=="light") { -@@ -1280,7 +1648,6 @@ +@@ -1220,7 +1570,6 @@ vis btOnOff2,1 vis bText2,0 vis hSlider2,0 @@ -652,7 +597,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",14 covx tTmp.txt,sys0,0,0 -@@ -1294,7 +1661,6 @@ +@@ -1234,7 +1583,6 @@ vis btOnOff2,1 vis bText2,0 vis hSlider2,0 @@ -660,7 +605,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",14 covx tTmp.txt,sys0,0,0 -@@ -1309,7 +1675,6 @@ +@@ -1249,7 +1597,6 @@ vis bText2,1 tsw bText2,0 vis hSlider2,0 @@ -668,7 +613,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) -@@ -1324,7 +1689,6 @@ +@@ -1264,7 +1611,6 @@ vis bText2,1 tsw bText2,1 vis hSlider2,0 @@ -676,7 +621,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) -@@ -1339,14 +1703,12 @@ +@@ -1279,14 +1625,12 @@ vis bText2,0 tsw bText2,0 vis hSlider2,1 @@ -691,7 +636,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //second value is min value spstr bText2.txt,tTmp.txt,"|",2 covx tTmp.txt,sys0,0,0 -@@ -1370,7 +1732,6 @@ +@@ -1310,7 +1654,6 @@ vis tIcon3,0 vis bText3,0 vis hSlider3,0 @@ -699,7 +644,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt }else { // change icon -@@ -1394,7 +1755,6 @@ +@@ -1334,7 +1677,6 @@ vis btOnOff3,0 vis bText3,0 vis hSlider3,0 @@ -707,7 +652,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(type3.txt=="light") { -@@ -1404,7 +1764,6 @@ +@@ -1344,7 +1686,6 @@ vis btOnOff3,1 vis bText3,0 vis hSlider3,0 @@ -715,7 +660,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,sys0,0,0 -@@ -1418,7 +1777,6 @@ +@@ -1358,7 +1699,6 @@ vis btOnOff3,1 vis bText3,0 vis hSlider3,0 @@ -723,7 +668,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,sys0,0,0 -@@ -1433,7 +1791,6 @@ +@@ -1373,7 +1713,6 @@ vis bText3,1 tsw bText3,0 vis hSlider3,0 @@ -731,7 +676,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) -@@ -1448,7 +1805,6 @@ +@@ -1388,7 +1727,6 @@ vis bText3,1 tsw bText3,1 vis hSlider3,0 @@ -739,7 +684,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) -@@ -1463,14 +1819,12 @@ +@@ -1403,14 +1741,12 @@ vis bText3,0 tsw bText3,0 vis hSlider3,1 @@ -754,7 +699,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //second value is min value spstr bText3.txt,tTmp.txt,"|",2 covx tTmp.txt,sys0,0,0 -@@ -1494,7 +1848,6 @@ +@@ -1434,7 +1770,6 @@ vis tIcon4,0 vis bText4,0 vis hSlider4,0 @@ -762,7 +707,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt }else { // change icon -@@ -1518,7 +1871,6 @@ +@@ -1458,7 +1793,6 @@ vis btOnOff4,0 vis bText4,0 vis hSlider4,0 @@ -770,7 +715,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(type4.txt=="light") { -@@ -1528,7 +1880,6 @@ +@@ -1468,7 +1802,6 @@ vis btOnOff4,1 vis bText4,0 vis hSlider4,0 @@ -778,7 +723,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",26 covx tTmp.txt,sys0,0,0 -@@ -1542,7 +1893,6 @@ +@@ -1482,7 +1815,6 @@ vis btOnOff4,1 vis bText4,0 vis hSlider4,0 @@ -786,7 +731,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",26 covx tTmp.txt,sys0,0,0 -@@ -1557,7 +1907,6 @@ +@@ -1497,7 +1829,6 @@ vis bText4,1 tsw bText4,0 vis hSlider4,0 @@ -794,7 +739,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) -@@ -1572,7 +1921,6 @@ +@@ -1512,7 +1843,6 @@ vis bText4,1 tsw bText4,1 vis hSlider4,0 @@ -802,7 +747,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) -@@ -1587,14 +1935,12 @@ +@@ -1527,14 +1857,12 @@ vis bText4,0 tsw bText4,0 vis hSlider4,1 @@ -817,7 +762,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //second value is min value spstr bText4.txt,tTmp.txt,"|",2 covx tTmp.txt,sys0,0,0 -@@ -1604,6 +1950,238 @@ +@@ -1544,6 +1872,238 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -1056,137 +1001,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-29 09:00:45.659455717 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 09:00:46.159475076 +0000 -@@ -30,21 +30,21 @@ - - Variable (string) entn - Attributes -- ID : 18 -+ ID : 17 - Scope : local - Text : - Max. Text Size: 50 - - Variable (string) vaSpeakerList - Attributes -- ID : 27 -+ ID : 26 - Scope : local - Text : - Max. Text Size: 200 - - Variable (int32) vaSpeakerPos - Attributes -- ID : 28 -+ ID : 27 - Scope: local - Value: 0 - -@@ -217,7 +217,7 @@ - - Text tIcon - Attributes -- ID : 17 -+ ID : 16 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -228,7 +228,7 @@ - - Text t1 - Attributes -- ID : 22 -+ ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -259,7 +259,7 @@ - - Text t3 - Attributes -- ID : 23 -+ ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -290,7 +290,7 @@ - - Text t4 - Attributes -- ID : 24 -+ ID : 23 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -301,7 +301,7 @@ - - Text tSpeaker - Attributes -- ID : 25 -+ ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -331,7 +331,7 @@ - - Text t6 - Attributes -- ID : 26 -+ ID : 25 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -354,7 +354,7 @@ - - Text t5 - Attributes -- ID : 29 -+ ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -392,7 +392,7 @@ - - Slider hVolume - Attributes -- ID : 16 -+ ID : 29 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -663,7 +663,7 @@ - - Timer tmSleep - Attributes -- ID : 19 -+ ID : 18 - Scope : local - Period (ms): 1000 - Enabled : yes -@@ -683,7 +683,7 @@ - - Timer tmCooldown - Attributes -- ID : 21 -+ ID : 20 - Scope : local - Period (ms): 100 - Enabled : no -@@ -694,7 +694,7 @@ - - TouchCap tc0 - Attributes -- ID : 20 -+ ID : 19 - Scope: local - Value: 0 - diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-29 09:00:45.659455717 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 09:00:46.159475076 +0000 -@@ -155,7 +155,7 @@ +--- HMI/n2t-out/pageStartup.txt 2022-03-29 09:55:00.537431470 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 09:55:01.025440103 +0000 +@@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none @@ -1195,7 +1013,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -315,10 +315,6 @@ +@@ -297,10 +297,6 @@ { page cardThermo } @@ -1207,9 +1025,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt { pageIcons.tTmp1.txt=tTmp.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-03-29 09:00:45.659455717 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 09:00:46.159475076 +0000 -@@ -252,8 +252,6 @@ +--- HMI/n2t-out/popupLight.txt 2022-03-29 09:55:00.537431470 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 09:55:01.025440103 +0000 +@@ -233,8 +233,6 @@ Events Touch Release Event @@ -1218,7 +1036,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //craft command tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," covx hBrightness.val,tTmp.txt,0,0 -@@ -283,8 +281,6 @@ +@@ -263,8 +261,6 @@ Events Touch Release Event @@ -1227,7 +1045,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //craft command tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," covx hTempSlider.val,tTmp.txt,0,0 -@@ -493,11 +489,8 @@ +@@ -468,11 +464,8 @@ vis t2,1 vis hBrightness,1 covx tTmp.txt,sys0,0,0 @@ -1239,7 +1057,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // get ColorTemp value spstr strCommand.txt,tTmp.txt,",",5 if(tTmp.txt=="disable") -@@ -529,11 +522,6 @@ +@@ -504,11 +497,6 @@ vis hTempSlider,1 vis t3,1 vis t4,1 @@ -1251,13 +1069,12 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // mode == 0 is rgb controls currently shown if(mode.val==0) { -@@ -635,17 +623,6 @@ +@@ -610,16 +598,6 @@ } } -Timer tmCooldown - Attributes -- ID : 26 - Scope : local - Period (ms): 100 - Enabled : no @@ -1268,4 +1085,4 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt - TouchCap tc0 Attributes - ID : 14 + Scope: local diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index c7f2cdec..098d5c6e 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -1,6 +1,5 @@ Page cardAlarm Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -38,56 +37,48 @@ Page cardAlarm Variable (string) strCommand Attributes - ID : 6 Scope : local Text : Max. Text Size: 200 Variable (string) entn Attributes - ID : 9 Scope : local Text : Max. Text Size: 50 Variable (string) tSend Attributes - ID : 25 Scope : local Text : Max. Text Size: 100 Variable (string) va1 Attributes - ID : 30 Scope : local Text : Max. Text Size: 20 Variable (string) va2 Attributes - ID : 31 Scope : local Text : Max. Text Size: 20 Variable (string) va3 Attributes - ID : 32 Scope : local Text : Max. Text Size: 20 Variable (string) va4 Attributes - ID : 33 Scope : local Text : Max. Text Size: 20 Text tTmp Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -98,7 +89,6 @@ Text tTmp Text tInstruction Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -109,7 +99,6 @@ Text tInstruction Text tId Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -120,7 +109,6 @@ Text tId Text tCode Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -131,7 +119,6 @@ Text tCode Text tIcon Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -142,7 +129,6 @@ Text tIcon Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -150,7 +136,6 @@ Picture p0 Button bNext Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +161,6 @@ Button bNext Button bPrev Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -202,7 +186,6 @@ Button bPrev Button b0 Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +200,6 @@ Button b0 Button b1 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -232,7 +214,6 @@ Button b1 Button b2 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -247,7 +228,6 @@ Button b2 Button b3 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -262,7 +242,6 @@ Button b3 Button b4 Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -277,7 +256,6 @@ Button b4 Button b5 Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -292,7 +270,6 @@ Button b5 Button b6 Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -307,7 +284,6 @@ Button b6 Button b7 Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -322,7 +298,6 @@ Button b7 Button b8 Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -337,7 +312,6 @@ Button b8 Button b9 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -352,7 +326,6 @@ Button b9 Button b10 Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -367,7 +340,6 @@ Button b10 Button arm1 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -398,7 +370,6 @@ Button arm1 Button arm3 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -429,7 +400,6 @@ Button arm3 Button arm2 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -460,7 +430,6 @@ Button arm2 Button arm4 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -491,7 +460,6 @@ Button arm4 Timer tmSerial Attributes - ID : 5 Scope : local Period (ms): 50 Enabled : yes @@ -691,7 +659,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 10 Scope : local Period (ms): 1000 Enabled : yes @@ -711,7 +678,6 @@ Timer tmSleep Timer tmFlash Attributes - ID : 34 Scope : local Period (ms): 600 Enabled : no @@ -730,7 +696,6 @@ Timer tmFlash TouchCap tc0 Attributes - ID : 11 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index a5ea7df2..ff720200 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1,6 +1,5 @@ Page cardEntities Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -80,98 +79,84 @@ Page cardEntities Variable (string) strCommand Attributes - ID : 27 Scope : local Text : Max. Text Size: 500 Variable (string) type1 Attributes - ID : 45 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 46 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 47 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 48 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 49 Scope : local Text : Max. Text Size: 70 Variable (string) entn2 Attributes - ID : 50 Scope : local Text : Max. Text Size: 70 Variable (string) entn3 Attributes - ID : 51 Scope : local Text : Max. Text Size: 70 Variable (string) entn4 Attributes - ID : 52 Scope : local Text : Max. Text Size: 70 Variable (string) entn5 Attributes - ID : 70 Scope : local Text : Max. Text Size: 50 Variable (string) entn6 Attributes - ID : 71 Scope : local Text : Max. Text Size: 50 Variable (string) type5 Attributes - ID : 72 Scope : local Text : Max. Text Size: 10 Variable (string) type6 Attributes - ID : 73 Scope : local Text : Max. Text Size: 10 Text tHeading Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -182,7 +167,6 @@ Text tHeading Text tEntity1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -193,7 +177,6 @@ Text tEntity1 Text tEntity2 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -204,7 +187,6 @@ Text tEntity2 Text tEntity3 Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -215,7 +197,6 @@ Text tEntity3 Text tEntity4 Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -226,7 +207,6 @@ Text tEntity4 Text tIcon1 Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -237,7 +217,6 @@ Text tIcon1 Text tIcon2 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -248,7 +227,6 @@ Text tIcon2 Text tIcon3 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -259,7 +237,6 @@ Text tIcon3 Text tIcon4 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -270,7 +247,6 @@ Text tIcon4 Text tSend Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -281,7 +257,6 @@ Text tSend Text tTmp Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -292,7 +267,6 @@ Text tTmp Text tInstruction Attributes - ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -303,7 +277,6 @@ Text tInstruction Text tId Attributes - ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -314,7 +287,6 @@ Text tId Text tEntity5 Attributes - ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -325,7 +297,6 @@ Text tEntity5 Text tIcon5 Attributes - ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -336,7 +307,6 @@ Text tIcon5 Text tEntity6 Attributes - ID : 62 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -347,7 +317,6 @@ Text tEntity6 Text tIcon6 Attributes - ID : 63 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -358,7 +327,6 @@ Text tIcon6 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -366,7 +334,6 @@ Picture p0 Slider hSlider1 Attributes - ID : 74 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -377,7 +344,6 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 75 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -388,7 +354,6 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 76 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -399,7 +364,6 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 77 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -410,7 +374,6 @@ Slider hSlider4 Slider hSlider5 Attributes - ID : 78 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -421,7 +384,6 @@ Slider hSlider5 Slider hSlider6 Attributes - ID : 79 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -432,7 +394,6 @@ Slider hSlider6 Button bDown1 Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -458,7 +419,6 @@ Button bDown1 Button bUp1 Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -484,7 +444,6 @@ Button bUp1 Button bStop1 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -510,7 +469,6 @@ Button bStop1 Button bStop2 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -536,7 +494,6 @@ Button bStop2 Button bDown2 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -562,7 +519,6 @@ Button bDown2 Button bUp2 Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -588,7 +544,6 @@ Button bUp2 Button bStop3 Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -614,7 +569,6 @@ Button bStop3 Button bDown3 Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -640,7 +594,6 @@ Button bDown3 Button bUp3 Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -666,7 +619,6 @@ Button bUp3 Button bStop4 Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -692,7 +644,6 @@ Button bStop4 Button bDown4 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -718,7 +669,6 @@ Button bDown4 Button bUp4 Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -744,7 +694,6 @@ Button bUp4 Button bPrev Attributes - ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -770,7 +719,6 @@ Button bPrev Button bNext Attributes - ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -796,7 +744,6 @@ Button bNext Button bText1 Attributes - ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -822,7 +769,6 @@ Button bText1 Button bText2 Attributes - ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -848,7 +794,6 @@ Button bText2 Button bText3 Attributes - ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -874,7 +819,6 @@ Button bText3 Button bText4 Attributes - ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -900,7 +844,6 @@ Button bText4 Button bStop5 Attributes - ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -926,7 +869,6 @@ Button bStop5 Button bDown5 Attributes - ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -952,7 +894,6 @@ Button bDown5 Button bUp5 Attributes - ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -978,7 +919,6 @@ Button bUp5 Button bText5 Attributes - ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1004,7 +944,6 @@ Button bText5 Button bStop6 Attributes - ID : 64 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1030,7 +969,6 @@ Button bStop6 Button bDown6 Attributes - ID : 65 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1056,7 +994,6 @@ Button bDown6 Button bUp6 Attributes - ID : 66 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1082,7 +1019,6 @@ Button bUp6 Button bText6 Attributes - ID : 68 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1108,7 +1044,6 @@ Button bText6 Dual-state Button btOnOff1 Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1136,7 +1071,6 @@ Dual-state Button btOnOff1 Dual-state Button btOnOff2 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1164,7 +1098,6 @@ Dual-state Button btOnOff2 Dual-state Button btOnOff3 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1192,7 +1125,6 @@ Dual-state Button btOnOff3 Dual-state Button btOnOff4 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1220,7 +1152,6 @@ Dual-state Button btOnOff4 Dual-state Button btOnOff5 Attributes - ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1248,7 +1179,6 @@ Dual-state Button btOnOff5 Dual-state Button btOnOff6 Attributes - ID : 67 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1276,7 +1206,6 @@ Dual-state Button btOnOff6 Hotspot mSpecial Attributes - ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1294,7 +1223,6 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 41 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1317,7 +1245,6 @@ Hotspot m2 Hotspot m1 Attributes - ID : 42 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1340,7 +1267,6 @@ Hotspot m1 Hotspot m0 Attributes - ID : 43 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1363,7 +1289,6 @@ Hotspot m0 Hotspot m3 Attributes - ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1386,7 +1311,6 @@ Hotspot m3 Hotspot m4 Attributes - ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1409,7 +1333,6 @@ Hotspot m4 Hotspot m5 Attributes - ID : 69 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1432,7 +1355,6 @@ Hotspot m5 Timer tmSerial Attributes - ID : 30 Scope : local Period (ms): 50 Enabled : yes @@ -2274,7 +2196,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 36 Scope : local Period (ms): 1000 Enabled : yes @@ -2294,7 +2215,6 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 53 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 7bf63ebd..a83c7a57 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -1,6 +1,5 @@ Page cardGrid Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -38,98 +37,84 @@ Page cardGrid Variable (string) strCommand Attributes - ID : 4 Scope : local Text : Max. Text Size: 500 Variable (string) type1 Attributes - ID : 14 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 15 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 16 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 17 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 18 Scope : local Text : Max. Text Size: 70 Variable (string) entn2 Attributes - ID : 19 Scope : local Text : Max. Text Size: 70 Variable (string) entn3 Attributes - ID : 20 Scope : local Text : Max. Text Size: 70 Variable (string) entn4 Attributes - ID : 21 Scope : local Text : Max. Text Size: 70 Variable (string) type5 Attributes - ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) type6 Attributes - ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) entn5 Attributes - ID : 36 Scope : local Text : Max. Text Size: 50 Variable (string) entn6 Attributes - ID : 37 Scope : local Text : Max. Text Size: 50 Text tHeading Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -140,7 +125,6 @@ Text tHeading Text tEntity1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -151,7 +135,6 @@ Text tEntity1 Text tSend Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -162,7 +145,6 @@ Text tSend Text tTmp Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -173,7 +155,6 @@ Text tTmp Text tInstruction Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -184,7 +165,6 @@ Text tInstruction Text tId Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -195,7 +175,6 @@ Text tId Text tEntity2 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -206,7 +185,6 @@ Text tEntity2 Text tEntity3 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +195,6 @@ Text tEntity3 Text tEntity4 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -228,7 +205,6 @@ Text tEntity4 Text tEntity5 Attributes - ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -239,7 +215,6 @@ Text tEntity5 Text tEntity6 Attributes - ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -250,7 +225,6 @@ Text tEntity6 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -258,7 +232,6 @@ Picture p0 Button bPrev Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -284,7 +257,6 @@ Button bPrev Button bNext Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -310,7 +282,6 @@ Button bNext Button bEntity1 Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -347,7 +318,6 @@ Button bEntity1 Button bEntity2 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -384,7 +354,6 @@ Button bEntity2 Button bEntity3 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -421,7 +390,6 @@ Button bEntity3 Button bEntity4 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -458,7 +426,6 @@ Button bEntity4 Button bEntity5 Attributes - ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -495,7 +462,6 @@ Button bEntity5 Button bEntity6 Attributes - ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -532,7 +498,6 @@ Button bEntity6 Hotspot mSpecial Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -550,7 +515,6 @@ Hotspot mSpecial Timer tmSerial Attributes - ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -834,7 +798,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 13 Scope : local Period (ms): 1000 Enabled : yes @@ -854,7 +817,6 @@ Timer tmSleep Timer tmLP Attributes - ID : 38 Scope : local Period (ms): 500 Enabled : no @@ -868,7 +830,6 @@ Timer tmLP TouchCap tc0 Attributes - ID : 22 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 9aea1b73..61f40677 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -1,6 +1,5 @@ Page cardMedia Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -23,34 +22,29 @@ Page cardMedia Variable (string) strCommand Attributes - ID : 7 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 17 Scope : local Text : Max. Text Size: 50 Variable (string) vaSpeakerList Attributes - ID : 26 Scope : local Text : Max. Text Size: 200 Variable (int32) vaSpeakerPos Attributes - ID : 27 Scope: local Value: 0 Text tSend Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -61,7 +55,6 @@ Text tSend Text tTmp Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -72,7 +65,6 @@ Text tTmp Text tInstruction Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -83,7 +75,6 @@ Text tInstruction Text tId Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -94,7 +85,6 @@ Text tId Text tHeading Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -105,7 +95,6 @@ Text tHeading Text tTitle Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -116,7 +105,6 @@ Text tTitle Text tAuthor Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +115,6 @@ Text tAuthor Text t2 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -157,7 +144,6 @@ Text t2 Text tPlayPause Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -187,7 +173,6 @@ Text tPlayPause Text t0 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +202,6 @@ Text t0 Text tIcon Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -228,7 +212,6 @@ Text tIcon Text t1 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -259,7 +242,6 @@ Text t1 Text t3 Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -290,7 +272,6 @@ Text t3 Text t4 Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -301,7 +282,6 @@ Text t4 Text tSpeaker Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -331,7 +311,6 @@ Text tSpeaker Text t6 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -354,7 +333,6 @@ Text t6 Text t5 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -384,7 +362,6 @@ Text t5 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -392,7 +369,6 @@ Picture p0 Slider hVolume Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -424,7 +400,6 @@ Slider hVolume Button bNext Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -450,7 +425,6 @@ Button bNext Button bPrev Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -476,7 +450,6 @@ Button bPrev Timer tmSerial Attributes - ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -663,7 +636,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 18 Scope : local Period (ms): 1000 Enabled : yes @@ -683,7 +655,6 @@ Timer tmSleep Timer tmCooldown Attributes - ID : 20 Scope : local Period (ms): 100 Enabled : no @@ -694,7 +665,6 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 19 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index a50ca8e0..f805b2a3 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -1,6 +1,5 @@ Page cardThermo Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -36,84 +35,72 @@ Page cardThermo Variable (string) strCommand Attributes - ID : 7 Scope : local Text : Max. Text Size: 250 Variable (string) entn Attributes - ID : 22 Scope : local Text : Max. Text Size: 50 Variable (string) va0 Attributes - ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) va1 Attributes - ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) va2 Attributes - ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) va3 Attributes - ID : 36 Scope : local Text : Max. Text Size: 10 Variable (string) va4 Attributes - ID : 37 Scope : local Text : Max. Text Size: 10 Variable (string) va5 Attributes - ID : 38 Scope : local Text : Max. Text Size: 10 Variable (string) va6 Attributes - ID : 39 Scope : local Text : Max. Text Size: 10 Variable (string) va7 Attributes - ID : 40 Scope : local Text : Max. Text Size: 10 Variable (string) va8 Attributes - ID : 41 Scope : local Text : Max. Text Size: 10 Number nPageDisp Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -123,7 +110,6 @@ Number nPageDisp XFloat xTempCurr Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -133,7 +119,6 @@ XFloat xTempCurr XFloat xTempDest Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -143,7 +128,6 @@ XFloat xTempDest XFloat xTempMin Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -153,7 +137,6 @@ XFloat xTempMin XFloat xTempMax Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -163,7 +146,6 @@ XFloat xTempMax XFloat xTempStep Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -173,7 +155,6 @@ XFloat xTempStep Text tSend Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -184,7 +165,6 @@ Text tSend Text tTmp Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -195,7 +175,6 @@ Text tTmp Text tInstruction Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -206,7 +185,6 @@ Text tInstruction Text tId Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +195,6 @@ Text tId Text tHeading Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -228,7 +205,6 @@ Text tHeading Text tStatus Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -239,7 +215,6 @@ Text tStatus Text t2 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -250,7 +225,6 @@ Text t2 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -258,7 +232,6 @@ Picture p0 Button bNext Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -284,7 +257,6 @@ Button bNext Button bDown Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -321,7 +293,6 @@ Button bDown Button bUp Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -358,7 +329,6 @@ Button bUp Button bPrev Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -384,7 +354,6 @@ Button bPrev Dual-state Button bt0 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -412,7 +381,6 @@ Dual-state Button bt0 Dual-state Button bt1 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -440,7 +408,6 @@ Dual-state Button bt1 Dual-state Button bt2 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -468,7 +435,6 @@ Dual-state Button bt2 Dual-state Button bt3 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -496,7 +462,6 @@ Dual-state Button bt3 Dual-state Button bt4 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -524,7 +489,6 @@ Dual-state Button bt4 Dual-state Button bt5 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -552,7 +516,6 @@ Dual-state Button bt5 Dual-state Button bt6 Attributes - ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -580,7 +543,6 @@ Dual-state Button bt6 Dual-state Button bt7 Attributes - ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -608,7 +570,6 @@ Dual-state Button bt7 Dual-state Button bt8 Attributes - ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -636,7 +597,6 @@ Dual-state Button bt8 Timer tmSerial Attributes - ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -960,7 +920,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 20 Scope : local Period (ms): 1000 Enabled : yes @@ -980,7 +939,6 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 21 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index f66a3fae..486dc217 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -1,6 +1,5 @@ Page pageIcons Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -13,7 +12,6 @@ Page pageIcons Text t0 Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -24,7 +22,6 @@ Text t0 Text tIcons Attributes - ID : 3 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -35,7 +32,6 @@ Text tIcons Text tTmp1 Attributes - ID : 4 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -46,7 +42,6 @@ Text tTmp1 Text tTmp2 Attributes - ID : 5 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -57,7 +52,6 @@ Text tTmp2 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/US/portrait/n2t-out/pageSerialTest.txt b/HMI/US/portrait/n2t-out/pageSerialTest.txt index b605399d..ef8a1be1 100644 --- a/HMI/US/portrait/n2t-out/pageSerialTest.txt +++ b/HMI/US/portrait/n2t-out/pageSerialTest.txt @@ -1,6 +1,5 @@ Page pageSerialTest Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -19,7 +18,6 @@ Page pageSerialTest Number nCrcRecv Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -29,7 +27,6 @@ Number nCrcRecv Number nCrcCalc Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -39,7 +36,6 @@ Number nCrcCalc Number nIt Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -49,7 +45,6 @@ Number nIt Number nLength Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -59,7 +54,6 @@ Number nLength Text tStatus Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -70,7 +64,6 @@ Text tStatus Text tCmd Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -81,7 +74,6 @@ Text tCmd Text tBuffer Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -92,7 +84,6 @@ Text tBuffer Text tDesc Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -103,7 +94,6 @@ Text tDesc Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -111,7 +101,6 @@ Picture p0 Button b0 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +116,6 @@ Button b0 Button b1 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -143,7 +131,6 @@ Button b1 Timer tmSerial Attributes - ID : 2 Scope : local Period (ms): 400 Enabled : yes diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 025b2e53..60cfc851 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -1,6 +1,5 @@ Page pageStartup Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -36,14 +35,12 @@ Page pageStartup Variable (string) strCommand Attributes - ID : 5 Scope : local Text : Max. Text Size: 50 Number frame_ptr Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -53,7 +50,6 @@ Number frame_ptr Number spinner_w Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -63,7 +59,6 @@ Number spinner_w Number frapic_w Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -73,7 +68,6 @@ Number frapic_w Number usual_cnt Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -83,7 +77,6 @@ Number usual_cnt Text tSend Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -94,7 +87,6 @@ Text tSend Text tTmp Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -105,7 +97,6 @@ Text tTmp Text tInstruction Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -116,7 +107,6 @@ Text tInstruction Text tId Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +117,6 @@ Text tId Text tMsg1 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -138,7 +127,6 @@ Text tMsg1 Text tMsg2 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -149,7 +137,6 @@ Text tMsg2 Text tMsg3 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -160,7 +147,6 @@ Text tMsg3 Text tVersion Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -171,7 +157,6 @@ Text tVersion Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -179,7 +164,6 @@ Picture p0 Button bSendStartup Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -208,7 +192,6 @@ Button bSendStartup Hotspot mSpinner Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -226,7 +209,6 @@ Hotspot mSpinner Timer tmSerial Attributes - ID : 4 Scope : local Period (ms): 50 Enabled : yes @@ -359,7 +341,6 @@ Timer tmSerial Timer tmSpinner Attributes - ID : 9 Scope : local Period (ms): 80 Enabled : yes diff --git a/HMI/US/portrait/n2t-out/pageTest.txt b/HMI/US/portrait/n2t-out/pageTest.txt index eca9f9a6..9d9debdf 100644 --- a/HMI/US/portrait/n2t-out/pageTest.txt +++ b/HMI/US/portrait/n2t-out/pageTest.txt @@ -1,6 +1,5 @@ Page pageTest Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -17,7 +16,6 @@ Page pageTest Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -25,7 +23,6 @@ Picture p0 Button b0 Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -40,7 +37,6 @@ Button b0 Button b1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -55,7 +51,6 @@ Button b1 Button b3 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -70,7 +65,6 @@ Button b3 Button b6 Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -85,7 +79,6 @@ Button b6 Button b4 Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -100,7 +93,6 @@ Button b4 Button b5 Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -115,7 +107,6 @@ Button b5 Button b7 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -130,7 +121,6 @@ Button b7 Button b8 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -146,7 +136,6 @@ Button b8 Button b9 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -161,7 +150,6 @@ Button b9 Button b10 Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +164,6 @@ Button b10 Button b11 Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 3664688f..f7971bf0 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -1,6 +1,5 @@ Page popupLight Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -53,33 +52,28 @@ Page popupLight Variable (string) strCommand Attributes - ID : 17 Scope : local Text : Max. Text Size: 100 Variable (string) entn Attributes - ID : 21 Scope : local Text : newtxt Max. Text Size: 50 Variable (int32) mode Attributes - ID : 23 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 24 Scope: local Value: 0 Text tEntity Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -90,7 +84,6 @@ Text tEntity Text tIcon1 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -101,7 +94,6 @@ Text tIcon1 Text t1 Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -112,7 +104,6 @@ Text t1 Text t2 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -123,7 +114,6 @@ Text t2 Text t3 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -134,7 +124,6 @@ Text t3 Text t4 Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -145,7 +134,6 @@ Text t4 Text tSend Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -156,7 +144,6 @@ Text tSend Text tTmp Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -167,7 +154,6 @@ Text tTmp Text tInstruction Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -178,7 +164,6 @@ Text tInstruction Text tId Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -189,7 +174,6 @@ Text tId Text t0 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -200,7 +184,6 @@ Text t0 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -208,7 +191,6 @@ Picture p0 Picture pColorWheel Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -241,7 +223,6 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -270,7 +251,6 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -299,7 +279,6 @@ Slider hTempSlider Button b0 Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -325,7 +304,6 @@ Button b0 Button bColor Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -361,7 +339,6 @@ Button bColor Dual-state Button btOnOff1 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -390,7 +367,6 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 15 Scope : local Period (ms): 1000 Enabled : yes @@ -411,7 +387,6 @@ Timer tmSleep Timer tmSerial Attributes - ID : 16 Scope : local Period (ms): 50 Enabled : yes @@ -625,7 +600,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 14 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index fad07276..3dce4218 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -1,6 +1,5 @@ Page popupNotify Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -21,27 +20,23 @@ Page popupNotify Variable (string) strCommand Attributes - ID : 8 Scope : local Text : Max. Text Size: 1000 Variable (string) entn Attributes - ID : 15 Scope : local Text : Max. Text Size: 30 Variable (int32) vaOldSleepT Attributes - ID : 16 Scope: local Value: 0 Text tSend Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -52,7 +47,6 @@ Text tSend Text tTmp Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -63,7 +57,6 @@ Text tTmp Text tInstruction Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -74,7 +67,6 @@ Text tInstruction Text tId Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -85,7 +77,6 @@ Text tId Text tHeading Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -96,7 +87,6 @@ Text tHeading Text tText Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -107,7 +97,6 @@ Text tText Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -115,7 +104,6 @@ Picture p0 Button b0 Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -142,7 +130,6 @@ Button b0 Button b2 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -170,7 +157,6 @@ Button b2 Button b1 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -198,7 +184,6 @@ Button b1 Timer tmSleep Attributes - ID : 6 Scope : local Period (ms): 1000 Enabled : yes @@ -219,7 +204,6 @@ Timer tmSleep Timer tmSerial Attributes - ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -404,7 +388,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 5 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 0bc4ddf3..54f2a60d 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -1,6 +1,5 @@ Page popupShutter Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -40,21 +39,18 @@ Page popupShutter Variable (string) strCommand Attributes - ID : 10 Scope : local Text : Max. Text Size: 50 Variable (string) entn Attributes - ID : 18 Scope : local Text : newtxt Max. Text Size: 50 Text tEntity Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -65,7 +61,6 @@ Text tEntity Text tIcon1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -76,7 +71,6 @@ Text tIcon1 Text tSend Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -87,7 +81,6 @@ Text tSend Text tTmp Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -98,7 +91,6 @@ Text tTmp Text tInstruction Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -109,7 +101,6 @@ Text tInstruction Text tId Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -120,7 +111,6 @@ Text tId Text t1 Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -131,7 +121,6 @@ Text t1 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -139,7 +128,6 @@ Picture p0 Slider hPosition Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -169,7 +157,6 @@ Slider hPosition Button b0 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -195,7 +182,6 @@ Button b0 Button bDown1 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -221,7 +207,6 @@ Button bDown1 Button bStop1 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -247,7 +232,6 @@ Button bStop1 Button bUp1 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -273,7 +257,6 @@ Button bUp1 Timer tmSleep Attributes - ID : 8 Scope : local Period (ms): 1000 Enabled : yes @@ -294,7 +277,6 @@ Timer tmSleep Timer tmSerial Attributes - ID : 9 Scope : local Period (ms): 50 Enabled : yes @@ -438,7 +420,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 7 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index dad8e568..c5da1789 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -1,6 +1,5 @@ Page screensaver Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -55,41 +54,35 @@ Page screensaver Variable (string) strCommand Attributes - ID : 5 Scope : local Text : Max. Text Size: 200 Variable (string) vaTime Attributes - ID : 10 Scope : global Text : Max. Text Size: 15 Variable (string) vaDate Attributes - ID : 11 Scope : global Text : Max. Text Size: 30 Variable (string) tId Attributes - ID : 22 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 30 Scope: local Value: 0 Number originPage Attributes - ID : 3 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -99,7 +92,6 @@ Number originPage Text tInstruction Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -110,7 +102,6 @@ Text tInstruction Text tTmp Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -121,7 +112,6 @@ Text tTmp Text tTime Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -132,7 +122,6 @@ Text tTime Text tDate Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -143,7 +132,6 @@ Text tDate Text tSend Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -154,7 +142,6 @@ Text tSend Text tMainIcon Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -165,7 +152,6 @@ Text tMainIcon Text tMainText Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +162,6 @@ Text tMainText Text tForecast1 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -187,7 +172,6 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -198,7 +182,6 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -209,7 +192,6 @@ Text tF1Icon Text tForecast2 Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -220,7 +202,6 @@ Text tForecast2 Text tF2Icon Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +212,6 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -242,7 +222,6 @@ Text tForecast2Val Text t10 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -253,7 +232,6 @@ Text t10 Text tAMPM Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -264,7 +242,6 @@ Text tAMPM Text tForecast3Val Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -275,7 +252,6 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -286,7 +262,6 @@ Text tF3Icon Text tForecast3 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -297,7 +272,6 @@ Text tForecast3 Text tForecast4 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -308,7 +282,6 @@ Text tForecast4 Text tF4Icon Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -319,7 +292,6 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -330,7 +302,6 @@ Text tForecast4Val Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -338,7 +309,6 @@ Picture p0 Timer tmSerial Attributes - ID : 4 Scope : local Period (ms): 50 Enabled : yes @@ -529,7 +499,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 2 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index c7f2cdec..098d5c6e 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -1,6 +1,5 @@ Page cardAlarm Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -38,56 +37,48 @@ Page cardAlarm Variable (string) strCommand Attributes - ID : 6 Scope : local Text : Max. Text Size: 200 Variable (string) entn Attributes - ID : 9 Scope : local Text : Max. Text Size: 50 Variable (string) tSend Attributes - ID : 25 Scope : local Text : Max. Text Size: 100 Variable (string) va1 Attributes - ID : 30 Scope : local Text : Max. Text Size: 20 Variable (string) va2 Attributes - ID : 31 Scope : local Text : Max. Text Size: 20 Variable (string) va3 Attributes - ID : 32 Scope : local Text : Max. Text Size: 20 Variable (string) va4 Attributes - ID : 33 Scope : local Text : Max. Text Size: 20 Text tTmp Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -98,7 +89,6 @@ Text tTmp Text tInstruction Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -109,7 +99,6 @@ Text tInstruction Text tId Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -120,7 +109,6 @@ Text tId Text tCode Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -131,7 +119,6 @@ Text tCode Text tIcon Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -142,7 +129,6 @@ Text tIcon Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -150,7 +136,6 @@ Picture p0 Button bNext Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +161,6 @@ Button bNext Button bPrev Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -202,7 +186,6 @@ Button bPrev Button b0 Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +200,6 @@ Button b0 Button b1 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -232,7 +214,6 @@ Button b1 Button b2 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -247,7 +228,6 @@ Button b2 Button b3 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -262,7 +242,6 @@ Button b3 Button b4 Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -277,7 +256,6 @@ Button b4 Button b5 Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -292,7 +270,6 @@ Button b5 Button b6 Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -307,7 +284,6 @@ Button b6 Button b7 Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -322,7 +298,6 @@ Button b7 Button b8 Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -337,7 +312,6 @@ Button b8 Button b9 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -352,7 +326,6 @@ Button b9 Button b10 Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -367,7 +340,6 @@ Button b10 Button arm1 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -398,7 +370,6 @@ Button arm1 Button arm3 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -429,7 +400,6 @@ Button arm3 Button arm2 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -460,7 +430,6 @@ Button arm2 Button arm4 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -491,7 +460,6 @@ Button arm4 Timer tmSerial Attributes - ID : 5 Scope : local Period (ms): 50 Enabled : yes @@ -691,7 +659,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 10 Scope : local Period (ms): 1000 Enabled : yes @@ -711,7 +678,6 @@ Timer tmSleep Timer tmFlash Attributes - ID : 34 Scope : local Period (ms): 600 Enabled : no @@ -730,7 +696,6 @@ Timer tmFlash TouchCap tc0 Attributes - ID : 11 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index ef7ea2b2..983a206b 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1,6 +1,5 @@ Page cardEntities Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -66,70 +65,60 @@ Page cardEntities Variable (string) strCommand Attributes - ID : 27 Scope : local Text : Max. Text Size: 500 Variable (string) type1 Attributes - ID : 45 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 46 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 47 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 48 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 49 Scope : local Text : Max. Text Size: 70 Variable (string) entn2 Attributes - ID : 50 Scope : local Text : Max. Text Size: 70 Variable (string) entn3 Attributes - ID : 51 Scope : local Text : Max. Text Size: 70 Variable (string) entn4 Attributes - ID : 52 Scope : local Text : Max. Text Size: 70 Number nNum1 Attributes - ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -139,7 +128,6 @@ Number nNum1 Number nNum2 Attributes - ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -149,7 +137,6 @@ Number nNum2 Number nNum3 Attributes - ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -159,7 +146,6 @@ Number nNum3 Number nNum4 Attributes - ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -169,7 +155,6 @@ Number nNum4 Text tHeading Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -180,7 +165,6 @@ Text tHeading Text tEntity1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -191,7 +175,6 @@ Text tEntity1 Text tEntity2 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -202,7 +185,6 @@ Text tEntity2 Text tEntity3 Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -213,7 +195,6 @@ Text tEntity3 Text tEntity4 Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -224,7 +205,6 @@ Text tEntity4 Text tIcon1 Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -235,7 +215,6 @@ Text tIcon1 Text tIcon2 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -246,7 +225,6 @@ Text tIcon2 Text tIcon3 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -257,7 +235,6 @@ Text tIcon3 Text tIcon4 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -268,7 +245,6 @@ Text tIcon4 Text tSend Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -279,7 +255,6 @@ Text tSend Text tTmp Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -290,7 +265,6 @@ Text tTmp Text tInstruction Attributes - ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -301,7 +275,6 @@ Text tInstruction Text tId Attributes - ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -312,7 +285,6 @@ Text tId Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -320,7 +292,6 @@ Picture p0 Slider hSlider1 Attributes - ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -331,7 +302,6 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -342,7 +312,6 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -353,7 +322,6 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -364,7 +332,6 @@ Slider hSlider4 Button bDown1 Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -390,7 +357,6 @@ Button bDown1 Button bUp1 Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -416,7 +382,6 @@ Button bUp1 Button bStop1 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -442,7 +407,6 @@ Button bStop1 Button bStop2 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -468,7 +432,6 @@ Button bStop2 Button bDown2 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -494,7 +457,6 @@ Button bDown2 Button bUp2 Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -520,7 +482,6 @@ Button bUp2 Button bStop3 Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -546,7 +507,6 @@ Button bStop3 Button bDown3 Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -572,7 +532,6 @@ Button bDown3 Button bUp3 Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -598,7 +557,6 @@ Button bUp3 Button bStop4 Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -624,7 +582,6 @@ Button bStop4 Button bDown4 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -650,7 +607,6 @@ Button bDown4 Button bUp4 Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -676,7 +632,6 @@ Button bUp4 Button bPrev Attributes - ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -702,7 +657,6 @@ Button bPrev Button bNext Attributes - ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -728,7 +682,6 @@ Button bNext Button bText1 Attributes - ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -754,7 +707,6 @@ Button bText1 Button bText2 Attributes - ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -780,7 +732,6 @@ Button bText2 Button bText3 Attributes - ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -806,7 +757,6 @@ Button bText3 Button bText4 Attributes - ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -832,7 +782,6 @@ Button bText4 Dual-state Button btOnOff1 Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -860,7 +809,6 @@ Dual-state Button btOnOff1 Dual-state Button btOnOff2 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -888,7 +836,6 @@ Dual-state Button btOnOff2 Dual-state Button btOnOff3 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -916,7 +863,6 @@ Dual-state Button btOnOff3 Dual-state Button btOnOff4 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -944,7 +890,6 @@ Dual-state Button btOnOff4 Hotspot mSpecial Attributes - ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -962,7 +907,6 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 41 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -985,7 +929,6 @@ Hotspot m2 Hotspot m1 Attributes - ID : 42 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1008,7 +951,6 @@ Hotspot m1 Hotspot m0 Attributes - ID : 43 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1031,7 +973,6 @@ Hotspot m0 Hotspot m3 Attributes - ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1054,7 +995,6 @@ Hotspot m3 Timer tmSerial Attributes - ID : 30 Scope : local Period (ms): 50 Enabled : yes @@ -1696,7 +1636,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 36 Scope : local Period (ms): 1000 Enabled : yes @@ -1716,7 +1655,6 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 53 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 7bf63ebd..a83c7a57 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -1,6 +1,5 @@ Page cardGrid Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -38,98 +37,84 @@ Page cardGrid Variable (string) strCommand Attributes - ID : 4 Scope : local Text : Max. Text Size: 500 Variable (string) type1 Attributes - ID : 14 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 15 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 16 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 17 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 18 Scope : local Text : Max. Text Size: 70 Variable (string) entn2 Attributes - ID : 19 Scope : local Text : Max. Text Size: 70 Variable (string) entn3 Attributes - ID : 20 Scope : local Text : Max. Text Size: 70 Variable (string) entn4 Attributes - ID : 21 Scope : local Text : Max. Text Size: 70 Variable (string) type5 Attributes - ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) type6 Attributes - ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) entn5 Attributes - ID : 36 Scope : local Text : Max. Text Size: 50 Variable (string) entn6 Attributes - ID : 37 Scope : local Text : Max. Text Size: 50 Text tHeading Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -140,7 +125,6 @@ Text tHeading Text tEntity1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -151,7 +135,6 @@ Text tEntity1 Text tSend Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -162,7 +145,6 @@ Text tSend Text tTmp Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -173,7 +155,6 @@ Text tTmp Text tInstruction Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -184,7 +165,6 @@ Text tInstruction Text tId Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -195,7 +175,6 @@ Text tId Text tEntity2 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -206,7 +185,6 @@ Text tEntity2 Text tEntity3 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +195,6 @@ Text tEntity3 Text tEntity4 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -228,7 +205,6 @@ Text tEntity4 Text tEntity5 Attributes - ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -239,7 +215,6 @@ Text tEntity5 Text tEntity6 Attributes - ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -250,7 +225,6 @@ Text tEntity6 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -258,7 +232,6 @@ Picture p0 Button bPrev Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -284,7 +257,6 @@ Button bPrev Button bNext Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -310,7 +282,6 @@ Button bNext Button bEntity1 Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -347,7 +318,6 @@ Button bEntity1 Button bEntity2 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -384,7 +354,6 @@ Button bEntity2 Button bEntity3 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -421,7 +390,6 @@ Button bEntity3 Button bEntity4 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -458,7 +426,6 @@ Button bEntity4 Button bEntity5 Attributes - ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -495,7 +462,6 @@ Button bEntity5 Button bEntity6 Attributes - ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -532,7 +498,6 @@ Button bEntity6 Hotspot mSpecial Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -550,7 +515,6 @@ Hotspot mSpecial Timer tmSerial Attributes - ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -834,7 +798,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 13 Scope : local Period (ms): 1000 Enabled : yes @@ -854,7 +817,6 @@ Timer tmSleep Timer tmLP Attributes - ID : 38 Scope : local Period (ms): 500 Enabled : no @@ -868,7 +830,6 @@ Timer tmLP TouchCap tc0 Attributes - ID : 22 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 81a92856..61f40677 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -1,6 +1,5 @@ Page cardMedia Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -23,34 +22,29 @@ Page cardMedia Variable (string) strCommand Attributes - ID : 7 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 18 Scope : local Text : Max. Text Size: 50 Variable (string) vaSpeakerList Attributes - ID : 27 Scope : local Text : Max. Text Size: 200 Variable (int32) vaSpeakerPos Attributes - ID : 28 Scope: local Value: 0 Text tSend Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -61,7 +55,6 @@ Text tSend Text tTmp Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -72,7 +65,6 @@ Text tTmp Text tInstruction Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -83,7 +75,6 @@ Text tInstruction Text tId Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -94,7 +85,6 @@ Text tId Text tHeading Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -105,7 +95,6 @@ Text tHeading Text tTitle Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -116,7 +105,6 @@ Text tTitle Text tAuthor Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +115,6 @@ Text tAuthor Text t2 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -157,7 +144,6 @@ Text t2 Text tPlayPause Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -187,7 +173,6 @@ Text tPlayPause Text t0 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +202,6 @@ Text t0 Text tIcon Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -228,7 +212,6 @@ Text tIcon Text t1 Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -259,7 +242,6 @@ Text t1 Text t3 Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -290,7 +272,6 @@ Text t3 Text t4 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -301,7 +282,6 @@ Text t4 Text tSpeaker Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -331,7 +311,6 @@ Text tSpeaker Text t6 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -354,7 +333,6 @@ Text t6 Text t5 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -384,7 +362,6 @@ Text t5 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -392,7 +369,6 @@ Picture p0 Slider hVolume Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -424,7 +400,6 @@ Slider hVolume Button bNext Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -450,7 +425,6 @@ Button bNext Button bPrev Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -476,7 +450,6 @@ Button bPrev Timer tmSerial Attributes - ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -663,7 +636,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 Scope : local Period (ms): 1000 Enabled : yes @@ -683,7 +655,6 @@ Timer tmSleep Timer tmCooldown Attributes - ID : 21 Scope : local Period (ms): 100 Enabled : no @@ -694,7 +665,6 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 20 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index a50ca8e0..f805b2a3 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1,6 +1,5 @@ Page cardThermo Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -36,84 +35,72 @@ Page cardThermo Variable (string) strCommand Attributes - ID : 7 Scope : local Text : Max. Text Size: 250 Variable (string) entn Attributes - ID : 22 Scope : local Text : Max. Text Size: 50 Variable (string) va0 Attributes - ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) va1 Attributes - ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) va2 Attributes - ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) va3 Attributes - ID : 36 Scope : local Text : Max. Text Size: 10 Variable (string) va4 Attributes - ID : 37 Scope : local Text : Max. Text Size: 10 Variable (string) va5 Attributes - ID : 38 Scope : local Text : Max. Text Size: 10 Variable (string) va6 Attributes - ID : 39 Scope : local Text : Max. Text Size: 10 Variable (string) va7 Attributes - ID : 40 Scope : local Text : Max. Text Size: 10 Variable (string) va8 Attributes - ID : 41 Scope : local Text : Max. Text Size: 10 Number nPageDisp Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -123,7 +110,6 @@ Number nPageDisp XFloat xTempCurr Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -133,7 +119,6 @@ XFloat xTempCurr XFloat xTempDest Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -143,7 +128,6 @@ XFloat xTempDest XFloat xTempMin Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -153,7 +137,6 @@ XFloat xTempMin XFloat xTempMax Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -163,7 +146,6 @@ XFloat xTempMax XFloat xTempStep Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -173,7 +155,6 @@ XFloat xTempStep Text tSend Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -184,7 +165,6 @@ Text tSend Text tTmp Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -195,7 +175,6 @@ Text tTmp Text tInstruction Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -206,7 +185,6 @@ Text tInstruction Text tId Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +195,6 @@ Text tId Text tHeading Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -228,7 +205,6 @@ Text tHeading Text tStatus Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -239,7 +215,6 @@ Text tStatus Text t2 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -250,7 +225,6 @@ Text t2 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -258,7 +232,6 @@ Picture p0 Button bNext Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -284,7 +257,6 @@ Button bNext Button bDown Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -321,7 +293,6 @@ Button bDown Button bUp Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -358,7 +329,6 @@ Button bUp Button bPrev Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -384,7 +354,6 @@ Button bPrev Dual-state Button bt0 Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -412,7 +381,6 @@ Dual-state Button bt0 Dual-state Button bt1 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -440,7 +408,6 @@ Dual-state Button bt1 Dual-state Button bt2 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -468,7 +435,6 @@ Dual-state Button bt2 Dual-state Button bt3 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -496,7 +462,6 @@ Dual-state Button bt3 Dual-state Button bt4 Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -524,7 +489,6 @@ Dual-state Button bt4 Dual-state Button bt5 Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -552,7 +516,6 @@ Dual-state Button bt5 Dual-state Button bt6 Attributes - ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -580,7 +543,6 @@ Dual-state Button bt6 Dual-state Button bt7 Attributes - ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -608,7 +570,6 @@ Dual-state Button bt7 Dual-state Button bt8 Attributes - ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -636,7 +597,6 @@ Dual-state Button bt8 Timer tmSerial Attributes - ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -960,7 +920,6 @@ Timer tmSerial Timer tmSleep Attributes - ID : 20 Scope : local Period (ms): 1000 Enabled : yes @@ -980,7 +939,6 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 21 Scope: local Value: 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index f66a3fae..486dc217 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -1,6 +1,5 @@ Page pageIcons Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -13,7 +12,6 @@ Page pageIcons Text t0 Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -24,7 +22,6 @@ Text t0 Text tIcons Attributes - ID : 3 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -35,7 +32,6 @@ Text tIcons Text tTmp1 Attributes - ID : 4 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -46,7 +42,6 @@ Text tTmp1 Text tTmp2 Attributes - ID : 5 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -57,7 +52,6 @@ Text tTmp2 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/n2t-out/pageSerialTest.txt b/HMI/n2t-out/pageSerialTest.txt index b605399d..ef8a1be1 100644 --- a/HMI/n2t-out/pageSerialTest.txt +++ b/HMI/n2t-out/pageSerialTest.txt @@ -1,6 +1,5 @@ Page pageSerialTest Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -19,7 +18,6 @@ Page pageSerialTest Number nCrcRecv Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -29,7 +27,6 @@ Number nCrcRecv Number nCrcCalc Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -39,7 +36,6 @@ Number nCrcCalc Number nIt Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -49,7 +45,6 @@ Number nIt Number nLength Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -59,7 +54,6 @@ Number nLength Text tStatus Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -70,7 +64,6 @@ Text tStatus Text tCmd Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -81,7 +74,6 @@ Text tCmd Text tBuffer Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -92,7 +84,6 @@ Text tBuffer Text tDesc Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -103,7 +94,6 @@ Text tDesc Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -111,7 +101,6 @@ Picture p0 Button b0 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +116,6 @@ Button b0 Button b1 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -143,7 +131,6 @@ Button b1 Timer tmSerial Attributes - ID : 2 Scope : local Period (ms): 400 Enabled : yes diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 1ecc7bdf..fa6188b9 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -1,6 +1,5 @@ Page pageStartup Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -36,14 +35,12 @@ Page pageStartup Variable (string) strCommand Attributes - ID : 5 Scope : local Text : Max. Text Size: 50 Number frame_ptr Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -53,7 +50,6 @@ Number frame_ptr Number spinner_w Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -63,7 +59,6 @@ Number spinner_w Number frapic_w Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -73,7 +68,6 @@ Number frapic_w Number usual_cnt Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -83,7 +77,6 @@ Number usual_cnt Text tSend Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -94,7 +87,6 @@ Text tSend Text tTmp Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -105,7 +97,6 @@ Text tTmp Text tInstruction Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -116,7 +107,6 @@ Text tInstruction Text tId Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +117,6 @@ Text tId Text tMsg1 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -138,7 +127,6 @@ Text tMsg1 Text tMsg2 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -149,7 +137,6 @@ Text tMsg2 Text tMsg3 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -160,7 +147,6 @@ Text tMsg3 Text tVersion Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -171,7 +157,6 @@ Text tVersion Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -179,7 +164,6 @@ Picture p0 Button bSendStartup Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -208,7 +192,6 @@ Button bSendStartup Hotspot mSpinner Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -226,7 +209,6 @@ Hotspot mSpinner Timer tmSerial Attributes - ID : 4 Scope : local Period (ms): 50 Enabled : yes @@ -363,7 +345,6 @@ Timer tmSerial Timer tmSpinner Attributes - ID : 9 Scope : local Period (ms): 80 Enabled : yes diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index eca9f9a6..9d9debdf 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -1,6 +1,5 @@ Page pageTest Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -17,7 +16,6 @@ Page pageTest Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -25,7 +23,6 @@ Picture p0 Button b0 Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -40,7 +37,6 @@ Button b0 Button b1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -55,7 +51,6 @@ Button b1 Button b3 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -70,7 +65,6 @@ Button b3 Button b6 Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -85,7 +79,6 @@ Button b6 Button b4 Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -100,7 +93,6 @@ Button b4 Button b5 Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -115,7 +107,6 @@ Button b5 Button b7 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -130,7 +121,6 @@ Button b7 Button b8 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -146,7 +136,6 @@ Button b8 Button b9 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -161,7 +150,6 @@ Button b9 Button b10 Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +164,6 @@ Button b10 Button b11 Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 2a4b87d6..8d320b4c 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -1,6 +1,5 @@ Page popupLight Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -53,33 +52,28 @@ Page popupLight Variable (string) strCommand Attributes - ID : 17 Scope : local Text : Max. Text Size: 100 Variable (string) entn Attributes - ID : 21 Scope : local Text : newtxt Max. Text Size: 50 Variable (int32) mode Attributes - ID : 23 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 24 Scope: local Value: 0 Text tEntity Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -90,7 +84,6 @@ Text tEntity Text tIcon1 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -101,7 +94,6 @@ Text tIcon1 Text t1 Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -112,7 +104,6 @@ Text t1 Text t2 Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -123,7 +114,6 @@ Text t2 Text t3 Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -134,7 +124,6 @@ Text t3 Text t4 Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -145,7 +134,6 @@ Text t4 Text tSend Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -156,7 +144,6 @@ Text tSend Text tTmp Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -167,7 +154,6 @@ Text tTmp Text tInstruction Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -178,7 +164,6 @@ Text tInstruction Text tId Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -189,7 +174,6 @@ Text tId Text t0 Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -200,7 +184,6 @@ Text t0 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -208,7 +191,6 @@ Picture p0 Picture pColorWheel Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -241,7 +223,6 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -272,7 +253,6 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -303,7 +283,6 @@ Slider hTempSlider Button b0 Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -329,7 +308,6 @@ Button b0 Button bColor Attributes - ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -365,7 +343,6 @@ Button bColor Dual-state Button btOnOff1 Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -394,7 +371,6 @@ Dual-state Button btOnOff1 Timer tmSleep Attributes - ID : 15 Scope : local Period (ms): 1000 Enabled : yes @@ -415,7 +391,6 @@ Timer tmSleep Timer tmSerial Attributes - ID : 16 Scope : local Period (ms): 50 Enabled : yes @@ -637,7 +612,6 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 26 Scope : local Period (ms): 100 Enabled : no @@ -648,7 +622,6 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 14 Scope: local Value: 0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index fad07276..3dce4218 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -1,6 +1,5 @@ Page popupNotify Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -21,27 +20,23 @@ Page popupNotify Variable (string) strCommand Attributes - ID : 8 Scope : local Text : Max. Text Size: 1000 Variable (string) entn Attributes - ID : 15 Scope : local Text : Max. Text Size: 30 Variable (int32) vaOldSleepT Attributes - ID : 16 Scope: local Value: 0 Text tSend Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -52,7 +47,6 @@ Text tSend Text tTmp Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -63,7 +57,6 @@ Text tTmp Text tInstruction Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -74,7 +67,6 @@ Text tInstruction Text tId Attributes - ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -85,7 +77,6 @@ Text tId Text tHeading Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -96,7 +87,6 @@ Text tHeading Text tText Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -107,7 +97,6 @@ Text tText Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -115,7 +104,6 @@ Picture p0 Button b0 Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -142,7 +130,6 @@ Button b0 Button b2 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -170,7 +157,6 @@ Button b2 Button b1 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -198,7 +184,6 @@ Button b1 Timer tmSleep Attributes - ID : 6 Scope : local Period (ms): 1000 Enabled : yes @@ -219,7 +204,6 @@ Timer tmSleep Timer tmSerial Attributes - ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -404,7 +388,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 5 Scope: local Value: 0 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 0bc4ddf3..54f2a60d 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -1,6 +1,5 @@ Page popupShutter Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -40,21 +39,18 @@ Page popupShutter Variable (string) strCommand Attributes - ID : 10 Scope : local Text : Max. Text Size: 50 Variable (string) entn Attributes - ID : 18 Scope : local Text : newtxt Max. Text Size: 50 Text tEntity Attributes - ID : 2 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -65,7 +61,6 @@ Text tEntity Text tIcon1 Attributes - ID : 3 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -76,7 +71,6 @@ Text tIcon1 Text tSend Attributes - ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -87,7 +81,6 @@ Text tSend Text tTmp Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -98,7 +91,6 @@ Text tTmp Text tInstruction Attributes - ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -109,7 +101,6 @@ Text tInstruction Text tId Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -120,7 +111,6 @@ Text tId Text t1 Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -131,7 +121,6 @@ Text t1 Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -139,7 +128,6 @@ Picture p0 Slider hPosition Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -169,7 +157,6 @@ Slider hPosition Button b0 Attributes - ID : 4 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -195,7 +182,6 @@ Button b0 Button bDown1 Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -221,7 +207,6 @@ Button bDown1 Button bStop1 Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -247,7 +232,6 @@ Button bStop1 Button bUp1 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -273,7 +257,6 @@ Button bUp1 Timer tmSleep Attributes - ID : 8 Scope : local Period (ms): 1000 Enabled : yes @@ -294,7 +277,6 @@ Timer tmSleep Timer tmSerial Attributes - ID : 9 Scope : local Period (ms): 50 Enabled : yes @@ -438,7 +420,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 7 Scope: local Value: 0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index dad8e568..c5da1789 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -1,6 +1,5 @@ Page screensaver Attributes - ID : 0 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -55,41 +54,35 @@ Page screensaver Variable (string) strCommand Attributes - ID : 5 Scope : local Text : Max. Text Size: 200 Variable (string) vaTime Attributes - ID : 10 Scope : global Text : Max. Text Size: 15 Variable (string) vaDate Attributes - ID : 11 Scope : global Text : Max. Text Size: 30 Variable (string) tId Attributes - ID : 22 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 30 Scope: local Value: 0 Number originPage Attributes - ID : 3 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -99,7 +92,6 @@ Number originPage Text tInstruction Attributes - ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -110,7 +102,6 @@ Text tInstruction Text tTmp Attributes - ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -121,7 +112,6 @@ Text tTmp Text tTime Attributes - ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -132,7 +122,6 @@ Text tTime Text tDate Attributes - ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -143,7 +132,6 @@ Text tDate Text tSend Attributes - ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -154,7 +142,6 @@ Text tSend Text tMainIcon Attributes - ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -165,7 +152,6 @@ Text tMainIcon Text tMainText Attributes - ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +162,6 @@ Text tMainText Text tForecast1 Attributes - ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -187,7 +172,6 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -198,7 +182,6 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -209,7 +192,6 @@ Text tF1Icon Text tForecast2 Attributes - ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -220,7 +202,6 @@ Text tForecast2 Text tF2Icon Attributes - ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +212,6 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -242,7 +222,6 @@ Text tForecast2Val Text t10 Attributes - ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -253,7 +232,6 @@ Text t10 Text tAMPM Attributes - ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -264,7 +242,6 @@ Text tAMPM Text tForecast3Val Attributes - ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -275,7 +252,6 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -286,7 +262,6 @@ Text tF3Icon Text tForecast3 Attributes - ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -297,7 +272,6 @@ Text tForecast3 Text tForecast4 Attributes - ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -308,7 +282,6 @@ Text tForecast4 Text tF4Icon Attributes - ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -319,7 +292,6 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -330,7 +302,6 @@ Text tForecast4Val Picture p0 Attributes - ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -338,7 +309,6 @@ Picture p0 Timer tmSerial Attributes - ID : 4 Scope : local Period (ms): 50 Enabled : yes @@ -529,7 +499,6 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 2 Scope: local Value: 0