diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e71cdc7a..1ce0542f 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 17:10:42.617522109 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 17:10:42.617522109 +0000 @@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 17:10:42.617522109 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 17:10:42.617522109 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -99,8 +99,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-06 17:10:41.749533643 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 17:10:42.617522109 +0000 @@ -1152,10 +1152,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -113,8 +113,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 17:10:42.617522109 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 17:10:42.617522109 +0000 @@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -150,8 +150,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 12:47:20.835832380 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 17:10:42.617522109 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -164,9 +164,236 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 12:47:20.835832380 +0000 -@@ -406,10 +406,6 @@ +--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 17:10:42.617522109 +0000 +@@ -19,12 +19,9 @@ + entn.txt=pageIcons.tTmp2.txt + vis p0,0 + vis tSend,0 +- vis tPosHeading,0 +- vis hPosition,0 +- vis hTilt,0 +- vis bTLeft,0 +- vis bTStop,0 +- vis bTRight,0 ++ vis tTmp,0 ++ vis tInstruction,0 ++ vis tId,0 + //page open event + // event,pageOpenDetail,typeOfPage,tEntityName + // craft command +@@ -53,24 +50,6 @@ + Text : + Max. Text Size: 80 + +-Variable (string) tInstruction +- Attributes +- Scope : local +- Text : +- Max. Text Size: 20 +- +-Variable (string) tId +- Attributes +- Scope : local +- Text : +- Max. Text Size: 20 +- +-Variable (string) tTmp +- Attributes +- Scope : local +- Text : +- Max. Text Size: 10 +- + Text tEntity + Attributes + Scope : local +@@ -101,17 +80,17 @@ + Text : newtxt + Max. Text Size : 100 + +-Text tPosHeading ++Text tTmp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : Position +- Max. Text Size : 15 ++ Text : ++ Max. Text Size : 10 + +-Text tInfo1 ++Text tInstruction + Attributes + Scope : local + Dragging : 0 +@@ -119,9 +98,9 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 40 ++ Max. Text Size : 20 + +-Text tTiltHeading ++Text tId + Attributes + Scope : local + Dragging : 0 +@@ -129,45 +108,36 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 15 ++ Max. Text Size : 20 + +-Picture p0 ++Text tPosHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled ++ Associated Keyboard : none ++ Text : Position ++ Max. Text Size : 15 + +-Slider hPosition ++Text tInfo1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled +- Position : 50 +- Upper range limit : 100 +- Lower range limit : 0 ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 40 + +- Events +- Touch Release Event +- // event,buttonPress2,internalNameEntity,positionSlider,50 +- //craft command +- tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," +- covx hPosition.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 ++Picture p0 ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled + +-Slider hTilt ++Slider hPosition + Attributes + Scope : local + Dragging : 0 +@@ -296,81 +266,6 @@ + prints tSend.txt,0 + prints crcval,2 + +-Button bTLeft +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tSend.txt="event,buttonPress2,"+entn.txt+",up" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Button bTStop +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tSend.txt="event,buttonPress2,"+entn.txt+",stop" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Button bTRight +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tSend.txt="event,buttonPress2,"+entn.txt+",down" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- + Timer tmSleep + Attributes + Scope : local +@@ -505,18 +400,12 @@ + tsw bDown1,1 + bDown1.pco=65535 + } +- // set tTiltHeading (localization) +- spstr strCommand.txt,tTiltHeading.txt,"~",11 + } + if(tInstruction.txt=="dimmode") + { // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -177,31 +404,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt } if(tInstruction.txt=="time") { -diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-06 12:47:20.835832380 +0000 -@@ -397,9 +397,6 @@ - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 - dim=dimValue -- // get value normal -- spstr strCommand.txt,tTmp.txt,"~",2 -- covx tTmp.txt,dimValueNormal,0,0 - } - if(tInstruction.txt=="time") - { -@@ -501,14 +498,6 @@ - spstr strCommand.txt,tIcon2.txt,"~",19 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tIcon2.pco,0,0 -- if(tNotifyHead.txt!="") -- { -- ref tNotifyHead -- } -- if(tNotifyText.txt!="") -- { -- ref tNotifyText -- } - } - if(tInstruction.txt=="color") - { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 53ef3a6a..090e4c70 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -42,14 +42,14 @@ cardThermo 53 Component(s) 552 Line(s) of event code 290 Unique line(s) of event code +screensaver + 38 Component(s) + 319 Line(s) of event code + 253 Unique line(s) of event code cardEntities 65 Component(s) 1130 Line(s) of event code 494 Unique line(s) of event code -screensaver - 37 Component(s) - 305 Line(s) of event code - 244 Unique line(s) of event code cardAlarm 40 Component(s) 392 Line(s) of event code @@ -57,6 +57,6 @@ cardAlarm Total 13 Page(s) - 405 Component(s) - 4509 Line(s) of event code - 1190 Unique line(s) of event code + 406 Component(s) + 4523 Line(s) of event code + 1198 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index c2b90de5..0a83ca90 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -91,9 +91,9 @@ Text tTime Send Component ID : disabled Opacity : 127 x coordinate : 52 - y coordinate : 0 + y coordinate : 18 Width : 376 - Height : 154 + Height : 112 Effect : load Effect Priority : 0 Effect Time : 300 @@ -121,23 +121,23 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 154 + y coordinate : 162 Width : 450 - Height : 38 + Height : 32 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 0 Font Color : 65535 Horizontal Alignment : center - Vertical Alignment : center + Vertical Alignment : bottom Input Type : character Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 40 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -810,7 +810,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 + x coordinate : 15 y coordinate : 0 Width : 38 Height : 38 @@ -840,7 +840,7 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 434 + x coordinate : 428 y coordinate : 0 Width : 38 Height : 38 @@ -862,6 +862,36 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 +Text tDateAdd + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 15 + y coordinate : 130 + Width : 450 + Height : 32 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : bottom + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -942,6 +972,9 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 } if(tInstruction.txt=="time") { @@ -1043,6 +1076,15 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tDateAdd.txt,"~",21 + if(tNotifyHead.txt!="") + { + ref tNotifyHead + } + if(tNotifyText.txt!="") + { + ref tNotifyText + } } if(tInstruction.txt=="color") { @@ -1072,6 +1114,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco + tDateAdd.bco=tTime.bco spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 @@ -1114,6 +1157,8 @@ Timer tmSerial covx tTmp.txt,tMRIcon.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tDateAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index bd952279..5b7aedce 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -86,7 +86,7 @@ Text tDate Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 40 Text tMainIcon Attributes @@ -328,6 +328,16 @@ Text tIcon2 Text : Max. Text Size : 5 +Text tDateAdd + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + Picture p0 Attributes Scope : local @@ -397,6 +407,9 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 } if(tInstruction.txt=="time") { @@ -498,6 +511,15 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tDateAdd.txt,"~",21 + if(tNotifyHead.txt!="") + { + ref tNotifyHead + } + if(tNotifyText.txt!="") + { + ref tNotifyText + } } if(tInstruction.txt=="color") { @@ -527,6 +549,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco + tDateAdd.bco=tTime.bco spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 @@ -569,6 +592,8 @@ Timer tmSerial covx tTmp.txt,tMRIcon.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tDateAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b5877763..cab8f19e 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-06-06 12:47:19.779824907 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ 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-06-06 12:47:19.783824935 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -538,44 +538,234 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000 -@@ -474,22 +474,6 @@ - vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 -- vis tForecast1,0 -- vis tF1Icon,0 -- vis tForecast1Val,0 -- //move forecast values to the right -- tForecast4.txt=tForecast3.txt -- tForecast3.txt=tForecast2.txt -- tForecast2.txt=tForecast1.txt -- tForecast4Val.txt=tForecast3Val.txt -- tForecast3Val.txt=tForecast2Val.txt -- tForecast2Val.txt=tForecast1Val.txt -- tF4Icon.txt=tF3Icon.txt -- tF3Icon.txt=tF2Icon.txt -- tF2Icon.txt=tF1Icon.txt -- tF4Icon.pco=tF3Icon.pco -- tF3Icon.pco=tF2Icon.pco -- tF2Icon.pco=tF1Icon.pco +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +0000 +@@ -19,12 +19,9 @@ + entn.txt=pageIcons.tTmp2.txt + vis p0,0 + vis tSend,0 +- vis tPosHeading,0 +- vis hPosition,0 +- vis hTilt,0 +- vis bTLeft,0 +- vis bTStop,0 +- vis bTRight,0 ++ vis tTmp,0 ++ vis tInstruction,0 ++ vis tId,0 + //page open event + // event,pageOpenDetail,typeOfPage,tEntityName + // craft command +@@ -53,24 +50,6 @@ + Text : + Max. Text Size: 80 + +-Variable (string) tInstruction +- Attributes +- Scope : local +- Text : +- Max. Text Size: 20 +- +-Variable (string) tId +- Attributes +- Scope : local +- Text : +- Max. Text Size: 20 +- +-Variable (string) tTmp +- Attributes +- Scope : local +- Text : +- Max. Text Size: 10 +- + Text tEntity + Attributes + Scope : local +@@ -101,17 +80,17 @@ + Text : newtxt + Max. Text Size : 100 + +-Text tPosHeading ++Text tTmp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : Position +- Max. Text Size : 15 ++ Text : ++ Max. Text Size : 10 + +-Text tInfo1 ++Text tInstruction + Attributes + Scope : local + Dragging : 0 +@@ -119,9 +98,9 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 40 ++ Max. Text Size : 20 + +-Text tTiltHeading ++Text tId + Attributes + Scope : local + Dragging : 0 +@@ -129,45 +108,36 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 15 ++ Max. Text Size : 20 + +-Picture p0 ++Text tPosHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled ++ Associated Keyboard : none ++ Text : Position ++ Max. Text Size : 15 + +-Slider hPosition ++Text tInfo1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled +- Position : 50 +- Upper range limit : 100 +- Lower range limit : 0 ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 40 + +- Events +- Touch Release Event +- // event,buttonPress2,internalNameEntity,positionSlider,50 +- //craft command +- tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," +- covx hPosition.val,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 ++Picture p0 ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled + +-Slider hTilt ++Slider hPosition + Attributes + Scope : local + Dragging : 0 +@@ -296,81 +266,6 @@ + prints tSend.txt,0 + prints crcval,2 + +-Button bTLeft +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tSend.txt="event,buttonPress2,"+entn.txt+",up" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Button bTStop +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tSend.txt="event,buttonPress2,"+entn.txt+",stop" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Button bTRight +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text :  +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tSend.txt="event,buttonPress2,"+entn.txt+",down" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- + Timer tmSleep + Attributes + Scope : local +@@ -505,8 +400,6 @@ + tsw bDown1,1 + bDown1.pco=65535 } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 -@@ -501,14 +485,6 @@ - spstr strCommand.txt,tIcon2.txt,"~",19 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tIcon2.pco,0,0 -- if(tNotifyHead.txt!="") -- { -- ref tNotifyHead -- } -- if(tNotifyText.txt!="") -- { -- ref tNotifyText -- } +- // set tTiltHeading (localization) +- spstr strCommand.txt,tTiltHeading.txt,"~",11 } - if(tInstruction.txt=="color") + if(tInstruction.txt=="dimmode") { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 18163134..fcbc8599 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 12:47:20.327828785 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 12:47:19.779824907 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 12:47:20.275828417 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 12:47:19.783824935 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 12:47:20.279828445 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 17:10:42.181527903 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-06 12:47:19.783824935 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 12:47:20.279828445 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,23 +59,235 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 12:47:19.783824935 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 12:47:20.279828445 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-06-06 12:47:19.783824935 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-06 12:47:20.279828445 +0000 -+@@ -474,22 +474,6 @@ -+@@ -501,14 +485,6 @@ -+ spstr strCommand.txt,tIcon2.txt,"~",19 -+ spstr strCommand.txt,tTmp.txt,"~",20 -+ covx tTmp.txt,tIcon2.pco,0,0 -+- if(tNotifyHead.txt!="") -+- { -+- ref tNotifyHead -+- } -+- if(tNotifyText.txt!="") -+- { -+- ref tNotifyText -+- } ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000 ++diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ++--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +0000 ++@@ -19,12 +19,9 @@ ++ entn.txt=pageIcons.tTmp2.txt ++ vis p0,0 ++ vis tSend,0 ++- vis tPosHeading,0 ++- vis hPosition,0 ++- vis hTilt,0 ++- vis bTLeft,0 ++- vis bTStop,0 ++- vis bTRight,0 +++ vis tTmp,0 +++ vis tInstruction,0 +++ vis tId,0 ++ //page open event ++ // event,pageOpenDetail,typeOfPage,tEntityName ++ // craft command ++@@ -53,24 +50,6 @@ ++ Text : ++ Max. Text Size: 80 ++ ++-Variable (string) tInstruction ++- Attributes ++- Scope : local ++- Text : ++- Max. Text Size: 20 ++- ++-Variable (string) tId ++- Attributes ++- Scope : local ++- Text : ++- Max. Text Size: 20 ++- ++-Variable (string) tTmp ++- Attributes ++- Scope : local ++- Text : ++- Max. Text Size: 10 ++- ++ Text tEntity ++ Attributes ++ Scope : local ++@@ -101,17 +80,17 @@ ++ Text : newtxt ++ Max. Text Size : 100 ++ ++-Text tPosHeading +++Text tTmp ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++- Text : Position ++- Max. Text Size : 15 +++ Text : +++ Max. Text Size : 10 ++ ++-Text tInfo1 +++Text tInstruction ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -119,9 +98,9 @@ ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++- Max. Text Size : 40 +++ Max. Text Size : 20 ++ ++-Text tTiltHeading +++Text tId ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -129,45 +108,36 @@ ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++- Max. Text Size : 15 +++ Max. Text Size : 20 ++ ++-Picture p0 +++Text tPosHeading ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled +++ Associated Keyboard : none +++ Text : Position +++ Max. Text Size : 15 ++ ++-Slider hPosition +++Text tInfo1 ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++- Position : 50 ++- Upper range limit : 100 ++- Lower range limit : 0 +++ Associated Keyboard : none +++ Text : +++ Max. Text Size : 40 ++ ++- Events ++- Touch Release Event ++- // event,buttonPress2,internalNameEntity,positionSlider,50 ++- //craft command ++- tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," ++- covx hPosition.val,tTmp.txt,0,0 ++- tSend.txt+=tTmp.txt ++- //send calc crc ++- btlen tSend.txt,sys0 ++- crcrest 1,0xffff // reset CRC ++- crcputh 55 bb ++- crcputs sys0,2 ++- crcputs tSend.txt,0 ++- //send cmd ++- printh 55 bb ++- prints sys0,2 ++- prints tSend.txt,0 ++- prints crcval,2 +++Picture p0 +++ Attributes +++ Scope : local +++ Dragging : 0 +++ Disable release event after dragging: 0 +++ Send Component ID : disabled ++ ++-Slider hTilt +++Slider hPosition ++ Attributes ++ Scope : local ++ Dragging : 0 ++@@ -296,81 +266,6 @@ ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++-Button bTLeft ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- State : unpressed ++- Text :  ++- Max. Text Size : 10 ++- ++- Events ++- Touch Press Event ++- tSend.txt="event,buttonPress2,"+entn.txt+",up" ++- //send calc crc ++- btlen tSend.txt,sys0 ++- crcrest 1,0xffff // reset CRC ++- crcputh 55 bb ++- crcputs sys0,2 ++- crcputs tSend.txt,0 ++- //send cmd ++- printh 55 bb ++- prints sys0,2 ++- prints tSend.txt,0 ++- prints crcval,2 ++- ++-Button bTStop ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- State : unpressed ++- Text :  ++- Max. Text Size : 10 ++- ++- Events ++- Touch Press Event ++- tSend.txt="event,buttonPress2,"+entn.txt+",stop" ++- //send calc crc ++- btlen tSend.txt,sys0 ++- crcrest 1,0xffff // reset CRC ++- crcputh 55 bb ++- crcputs sys0,2 ++- crcputs tSend.txt,0 ++- //send cmd ++- printh 55 bb ++- prints sys0,2 ++- prints tSend.txt,0 ++- prints crcval,2 ++- ++-Button bTRight ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- State : unpressed ++- Text :  ++- Max. Text Size : 10 ++- ++- Events ++- Touch Press Event ++- tSend.txt="event,buttonPress2,"+entn.txt+",down" ++- //send calc crc ++- btlen tSend.txt,sys0 ++- crcrest 1,0xffff // reset CRC ++- crcputh 55 bb ++- crcputs sys0,2 ++- crcputs tSend.txt,0 ++- //send cmd ++- printh 55 bb ++- prints sys0,2 ++- prints tSend.txt,0 ++- prints crcval,2 ++- ++ Timer tmSleep ++ Attributes ++ Scope : local ++@@ -505,8 +400,6 @@ ++ tsw bDown1,1 ++ bDown1.pco=65535 ++- // set tTiltHeading (localization) ++- spstr strCommand.txt,tTiltHeading.txt,"~",11 + } -+ if(tInstruction.txt=="color") ++ if(tInstruction.txt=="dimmode") + { diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index d6290a5a..b9d77b2a 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -30,6 +30,10 @@ cardThermo 53 Component(s) 555 Line(s) of event code 292 Unique line(s) of event code +screensaver + 38 Component(s) + 319 Line(s) of event code + 253 Unique line(s) of event code cardEntities 77 Component(s) 1363 Line(s) of event code @@ -50,13 +54,9 @@ pageStartup 19 Component(s) 157 Line(s) of event code 117 Unique line(s) of event code -screensaver - 37 Component(s) - 292 Line(s) of event code - 230 Unique line(s) of event code Total 13 Page(s) - 417 Component(s) - 4749 Line(s) of event code - 1247 Unique line(s) of event code + 418 Component(s) + 4776 Line(s) of event code + 1270 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 9bb6a031..fb7602bc 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -93,7 +93,7 @@ Text tTime x coordinate : 0 y coordinate : 0 Width : 320 - Height : 150 + Height : 129 Effect : load Effect Priority : 0 Effect Time : 300 @@ -106,7 +106,7 @@ Text tTime Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 21:32 + Text : 21:32 Max. Text Size : 15 Word wrap : disabled Horizontal Spacing : 0 @@ -121,9 +121,9 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 180 + y coordinate : 195 Width : 320 - Height : 36 + Height : 32 Effect : load Effect Priority : 0 Effect Time : 300 @@ -137,7 +137,7 @@ Text tDate Vertical Alignment : center Input Type : character Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 40 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -151,7 +151,7 @@ Text tMainIcon Send Component ID : disabled Opacity : 127 x coordinate : 125 - y coordinate : 254 + y coordinate : 261 Width : 70 Height : 65 Effect : load @@ -181,7 +181,7 @@ Text tMainText Send Component ID : disabled Opacity : 127 x coordinate : 111 - y coordinate : 318 + y coordinate : 325 Width : 110 Height : 42 Effect : load @@ -211,7 +211,7 @@ Text tForecast1 Send Component ID : disabled Opacity : 127 x coordinate : 5 - y coordinate : 377 + y coordinate : 384 Width : 71 Height : 25 Effect : load @@ -241,7 +241,7 @@ Text tForecast1Val Send Component ID : disabled Opacity : 127 x coordinate : 2 - y coordinate : 443 + y coordinate : 450 Width : 70 Height : 24 Effect : load @@ -271,7 +271,7 @@ Text tF1Icon Send Component ID : disabled Opacity : 127 x coordinate : 23 - y coordinate : 406 + y coordinate : 413 Width : 40 Height : 34 Effect : load @@ -301,7 +301,7 @@ Text tForecast2 Send Component ID : disabled Opacity : 127 x coordinate : 86 - y coordinate : 378 + y coordinate : 385 Width : 71 Height : 24 Effect : load @@ -331,7 +331,7 @@ Text tF2Icon Send Component ID : disabled Opacity : 127 x coordinate : 103 - y coordinate : 406 + y coordinate : 413 Width : 40 Height : 34 Effect : load @@ -361,7 +361,7 @@ Text tForecast2Val Send Component ID : disabled Opacity : 127 x coordinate : 83 - y coordinate : 443 + y coordinate : 450 Width : 71 Height : 24 Effect : load @@ -391,7 +391,7 @@ Text t10 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 233 + y coordinate : 240 Width : 225 Height : 2 Effect : load @@ -421,7 +421,7 @@ Text tAMPM Send Component ID : disabled Opacity : 127 x coordinate : 105 - y coordinate : 122 + y coordinate : 108 Width : 103 Height : 57 Effect : load @@ -451,7 +451,7 @@ Text tForecast3Val Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 444 + y coordinate : 451 Width : 70 Height : 23 Effect : load @@ -481,7 +481,7 @@ Text tF3Icon Send Component ID : disabled Opacity : 127 x coordinate : 183 - y coordinate : 407 + y coordinate : 414 Width : 40 Height : 33 Effect : load @@ -511,7 +511,7 @@ Text tForecast3 Send Component ID : disabled Opacity : 127 x coordinate : 167 - y coordinate : 379 + y coordinate : 386 Width : 70 Height : 23 Effect : load @@ -541,7 +541,7 @@ Text tForecast4 Send Component ID : disabled Opacity : 127 x coordinate : 247 - y coordinate : 379 + y coordinate : 386 Width : 70 Height : 23 Effect : load @@ -571,7 +571,7 @@ Text tF4Icon Send Component ID : disabled Opacity : 127 x coordinate : 263 - y coordinate : 407 + y coordinate : 414 Width : 40 Height : 33 Effect : load @@ -601,7 +601,7 @@ Text tForecast4Val Send Component ID : disabled Opacity : 127 x coordinate : 246 - y coordinate : 444 + y coordinate : 451 Width : 70 Height : 23 Effect : load @@ -631,7 +631,7 @@ Text tMainTextAlt Send Component ID : disabled Opacity : 127 x coordinate : 184 - y coordinate : 262 + y coordinate : 269 Width : 105 Height : 41 Effect : load @@ -661,7 +661,7 @@ Text tMainIconAlt Send Component ID : disabled Opacity : 127 x coordinate : 44 - y coordinate : 273 + y coordinate : 280 Width : 100 Height : 65 Effect : load @@ -691,7 +691,7 @@ Text tMRIcon Send Component ID : disabled Opacity : 127 x coordinate : 182 - y coordinate : 317 + y coordinate : 324 Width : 40 Height : 34 Effect : load @@ -721,7 +721,7 @@ Text tMR Send Component ID : disabled Opacity : 127 x coordinate : 224 - y coordinate : 322 + y coordinate : 329 Width : 61 Height : 20 Effect : load @@ -751,7 +751,7 @@ Text tNotifyHead Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 253 + y coordinate : 257 Width : 320 Height : 58 Effect : load @@ -781,7 +781,7 @@ Text tNotifyText Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 311 + y coordinate : 315 Width : 320 Height : 58 Effect : load @@ -811,7 +811,7 @@ Text tIcon1 Send Component ID : disabled Opacity : 127 x coordinate : 8 - y coordinate : 220 + y coordinate : 227 Width : 33 Height : 30 Effect : load @@ -841,7 +841,7 @@ Text tIcon2 Send Component ID : disabled Opacity : 127 x coordinate : 282 - y coordinate : 220 + y coordinate : 227 Width : 33 Height : 30 Effect : load @@ -862,6 +862,36 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 +Text tDateAdd + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 163 + Width : 320 + Height : 32 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -1019,6 +1049,22 @@ Timer tmSerial vis tMainIconAlt,1 vis tMRIcon,1 vis tMR,1 + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco } //tMR spstr strCommand.txt,tMR.txt,"~",16 @@ -1030,6 +1076,15 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tDateAdd.txt,"~",21 + if(tNotifyHead.txt!="") + { + ref tNotifyHead + } + if(tNotifyText.txt!="") + { + ref tNotifyText + } } if(tInstruction.txt=="color") { @@ -1059,6 +1114,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco + tDateAdd.bco=tTime.bco spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 @@ -1101,6 +1157,8 @@ Timer tmSerial covx tTmp.txt,tMRIcon.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tDateAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 846734c3..e7c0c3cb 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -75,7 +75,7 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 21:32 + Text : 21:32 Max. Text Size : 15 Text tDate @@ -86,7 +86,7 @@ Text tDate Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 40 Text tMainIcon Attributes @@ -328,6 +328,16 @@ Text tIcon2 Text : Max. Text Size : 5 +Text tDateAdd + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + Picture p0 Attributes Scope : local @@ -474,6 +484,22 @@ Timer tmSerial vis tMainIconAlt,1 vis tMRIcon,1 vis tMR,1 + vis tForecast1,0 + vis tF1Icon,0 + vis tForecast1Val,0 + //move forecast values to the right + tForecast4.txt=tForecast3.txt + tForecast3.txt=tForecast2.txt + tForecast2.txt=tForecast1.txt + tForecast4Val.txt=tForecast3Val.txt + tForecast3Val.txt=tForecast2Val.txt + tForecast2Val.txt=tForecast1Val.txt + tF4Icon.txt=tF3Icon.txt + tF3Icon.txt=tF2Icon.txt + tF2Icon.txt=tF1Icon.txt + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco } //tMR spstr strCommand.txt,tMR.txt,"~",16 @@ -485,6 +511,15 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tDateAdd.txt,"~",21 + if(tNotifyHead.txt!="") + { + ref tNotifyHead + } + if(tNotifyText.txt!="") + { + ref tNotifyText + } } if(tInstruction.txt=="color") { @@ -514,6 +549,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco + tDateAdd.bco=tTime.bco spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 @@ -556,6 +592,8 @@ Timer tmSerial covx tTmp.txt,tMRIcon.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tDateAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 30253ae5..7b9e9fcf 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,14 +22,6 @@ popupLight 27 Component(s) 352 Line(s) of event code 191 Unique line(s) of event code -popupShutter - 20 Component(s) - 248 Line(s) of event code - 141 Unique line(s) of event code -screensaver - 37 Component(s) - 315 Line(s) of event code - 249 Unique line(s) of event code cardMedia 34 Component(s) 363 Line(s) of event code @@ -38,6 +30,10 @@ pageStartup 19 Component(s) 157 Line(s) of event code 117 Unique line(s) of event code +popupShutter + 25 Component(s) + 294 Line(s) of event code + 145 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -50,6 +46,10 @@ cardThermo 53 Component(s) 555 Line(s) of event code 292 Unique line(s) of event code +screensaver + 38 Component(s) + 319 Line(s) of event code + 253 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 406 Component(s) - 4557 Line(s) of event code - 1207 Unique line(s) of event code + 412 Component(s) + 4607 Line(s) of event code + 1218 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index fdb842af..77c46375 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -27,9 +27,12 @@ Page popupShutter entn.txt=pageIcons.tTmp2.txt vis p0,0 vis tSend,0 - vis tTmp,0 - vis tInstruction,0 - vis tId,0 + vis tPosHeading,0 + vis hPosition,0 + vis hTilt,0 + vis bTLeft,0 + vis bTStop,0 + vis bTRight,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -48,18 +51,39 @@ Page popupShutter Variable (string) strCommand Attributes - ID : 10 + ID : 9 Scope : local Text : Max. Text Size: 200 Variable (string) entn Attributes - ID : 18 + ID : 15 Scope : local Text : Max. Text Size: 80 +Variable (string) tInstruction + Attributes + ID : 17 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tId + Attributes + ID : 18 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tTmp + Attributes + ID : 19 + Scope : local + Text : + Max. Text Size: 10 + Text tEntity Attributes ID : 2 @@ -69,7 +93,7 @@ Text tEntity Send Component ID : disabled Opacity : 127 x coordinate : 65 - y coordinate : 94 + y coordinate : 48 Width : 195 Height : 30 Effect : load @@ -99,7 +123,7 @@ Text tIcon1 Send Component ID : disabled Opacity : 127 x coordinate : 12 - y coordinate : 108 + y coordinate : 63 Width : 45 Height : 30 Effect : load @@ -150,106 +174,16 @@ Text tSend Horizontal Spacing : 0 Vertical Spacing : 0 -Text tTmp - Attributes - ID : 6 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 406 - y coordinate : 277 - Width : 34 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tInstruction - Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 290 - Width : 100 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tId - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 100 - y coordinate : 290 - Width : 100 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tPosHeading Attributes - ID : 17 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 64 - y coordinate : 164 + y coordinate : 122 Width : 100 Height : 30 Effect : load @@ -261,7 +195,7 @@ Text tPosHeading Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Position @@ -272,14 +206,14 @@ Text tPosHeading Text tInfo1 Attributes - ID : 19 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 65 - y coordinate : 122 + y coordinate : 76 Width : 195 Height : 30 Effect : load @@ -300,6 +234,36 @@ Text tInfo1 Horizontal Spacing : 0 Vertical Spacing : 0 +Text tTiltHeading + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 64 + y coordinate : 231 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 15 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -319,14 +283,58 @@ Picture p0 Slider hPosition Attributes - ID : 16 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 65 - y coordinate : 194 + x coordinate : 64 + y coordinate : 152 + Width : 335 + Height : 43 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + // event,buttonPress2,internalNameEntity,positionSlider,50 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," + covx hPosition.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTilt + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 64 + y coordinate : 261 Width : 335 Height : 43 Effect : load @@ -410,14 +418,14 @@ Button b0 Button bDown1 Attributes - ID : 13 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 - y coordinate : 96 + x coordinate : 386 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -457,14 +465,14 @@ Button bDown1 Button bStop1 Attributes - ID : 14 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 341 - y coordinate : 96 + x coordinate : 334 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -504,14 +512,14 @@ Button bStop1 Button bUp1 Attributes - ID : 15 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 289 - y coordinate : 96 + x coordinate : 282 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -549,9 +557,150 @@ Button bUp1 prints tSend.txt,0 prints crcval,2 +Button bTLeft + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 282 + y coordinate : 205 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bTStop + Attributes + ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 334 + y coordinate : 205 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bTRight + Attributes + ID : 24 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 386 + y coordinate : 205 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Timer tmSleep Attributes - ID : 8 + ID : 7 Scope : local Period (ms): 1000 Enabled : yes @@ -571,7 +720,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 9 + ID : 8 Scope : local Period (ms): 50 Enabled : yes @@ -685,6 +834,8 @@ Timer tmSerial tsw bDown1,1 bDown1.pco=65535 } + // set tTiltHeading (localization) + spstr strCommand.txt,tTiltHeading.txt,"~",11 } if(tInstruction.txt=="dimmode") { @@ -785,7 +936,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 7 + ID : 6 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 1c856c93..e0510d76 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -91,9 +91,9 @@ Text tTime Send Component ID : disabled Opacity : 127 x coordinate : 37 - y coordinate : 0 + y coordinate : 18 Width : 376 - Height : 154 + Height : 112 Effect : load Effect Priority : 0 Effect Time : 300 @@ -121,9 +121,9 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 154 + y coordinate : 162 Width : 450 - Height : 38 + Height : 32 Effect : load Effect Priority : 0 Effect Time : 300 @@ -134,10 +134,10 @@ Text tDate Back. Color : 0 Font Color : 65535 Horizontal Alignment : center - Vertical Alignment : center + Vertical Alignment : bottom Input Type : character Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 40 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -862,6 +862,36 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 +Text tDateAdd + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 130 + Width : 450 + Height : 32 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : bottom + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -1046,6 +1076,7 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -1083,6 +1114,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco + tDateAdd.bco=tTime.bco spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 @@ -1125,6 +1157,8 @@ Timer tmSerial covx tTmp.txt,tMRIcon.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tDateAdd.pco,0,0 } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 13d22206..68dd77b6 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -19,9 +19,12 @@ Page popupShutter entn.txt=pageIcons.tTmp2.txt vis p0,0 vis tSend,0 - vis tTmp,0 - vis tInstruction,0 - vis tId,0 + vis tPosHeading,0 + vis hPosition,0 + vis hTilt,0 + vis bTLeft,0 + vis bTStop,0 + vis bTRight,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -50,6 +53,24 @@ Variable (string) entn Text : Max. Text Size: 80 +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + Text tEntity Attributes Scope : local @@ -80,36 +101,6 @@ Text tSend Text : newtxt Max. Text Size : 100 -Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tInstruction - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - -Text tId - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - Text tPosHeading Attributes Scope : local @@ -130,6 +121,16 @@ Text tInfo1 Text : Max. Text Size : 40 +Text tTiltHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 15 + Picture p0 Attributes Scope : local @@ -166,6 +167,35 @@ Slider hPosition prints tSend.txt,0 prints crcval,2 +Slider hTilt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + // event,buttonPress2,internalNameEntity,positionSlider,50 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," + covx hPosition.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Button b0 Attributes Scope : local @@ -266,6 +296,81 @@ Button bUp1 prints tSend.txt,0 prints crcval,2 +Button bTLeft + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bTStop + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bTRight + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Timer tmSleep Attributes Scope : local @@ -400,6 +505,8 @@ Timer tmSerial tsw bDown1,1 bDown1.pco=65535 } + // set tTiltHeading (localization) + spstr strCommand.txt,tTiltHeading.txt,"~",11 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 616f72c9..5b7aedce 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -86,7 +86,7 @@ Text tDate Send Component ID : disabled Associated Keyboard : none Text : Tuesday, 08. March 2022 - Max. Text Size : 35 + Max. Text Size : 40 Text tMainIcon Attributes @@ -328,6 +328,16 @@ Text tIcon2 Text : Max. Text Size : 5 +Text tDateAdd + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + Picture p0 Attributes Scope : local @@ -501,6 +511,7 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tDateAdd.txt,"~",21 if(tNotifyHead.txt!="") { ref tNotifyHead @@ -538,6 +549,7 @@ Timer tmSerial tForecast4.bco=tTime.bco tForecast4Val.bco=tTime.bco tF4Icon.bco=tTime.bco + tDateAdd.bco=tTime.bco spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,tTime.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",3 @@ -580,6 +592,8 @@ Timer tmSerial covx tTmp.txt,tMRIcon.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tDateAdd.pco,0,0 } if(tInstruction.txt=="notify") {