diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 074ace77..282738d7 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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:32:17.830992218 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 20:32:17.834992421 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:32:17.834992421 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:32:17.830992218 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:32:17.834992421 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:32:17.830992218 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 20:32:17.830992218 +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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 17:53:03.360649001 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 20:32:17.830992218 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -163,244 +163,3 @@ 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 17:53:02.496648542 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-06 17:53:03.360649001 +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 -- // get value normal -- spstr strCommand.txt,tTmp.txt,"~",2 -- covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal - } - if(tInstruction.txt=="time") - { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 090e4c70..360e76c8 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 @@ -35,9 +35,9 @@ cardGrid 436 Line(s) of event code 257 Unique line(s) of event code popupShutter - 20 Component(s) - 245 Line(s) of event code - 139 Unique line(s) of event code + 25 Component(s) + 330 Line(s) of event code + 162 Unique line(s) of event code cardThermo 53 Component(s) 552 Line(s) of event code @@ -57,6 +57,6 @@ cardAlarm Total 13 Page(s) - 406 Component(s) - 4523 Line(s) of event code - 1198 Unique line(s) of event code + 411 Component(s) + 4608 Line(s) of event code + 1220 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 53f83203..5667c7f5 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/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 : 80 - 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 : 27 - 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 : 421 - 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 : 15 - 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 : 115 - 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 : 79 - 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 : 80 - 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 : 79 + 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 @@ -310,8 +274,8 @@ Picture p0 Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 480 - Height : 320 + Width : 479 + Height : 319 Effect : load Effect Priority : 0 Effect Time : 300 @@ -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 : 80 - y coordinate : 194 + x coordinate : 79 + 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 : 79 + 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 : 408 - y coordinate : 96 + x coordinate : 401 + 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 : 356 - y coordinate : 96 + x coordinate : 349 + 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 : 304 - y coordinate : 96 + x coordinate : 297 + 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 : 297 + 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 : 349 + 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 : 401 + 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,12 +834,57 @@ Timer tmSerial tsw bDown1,1 bDown1.pco=65535 } + // set tTiltHeading (localization) + spstr strCommand.txt,tTiltHeading.txt,"~",11 + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",15 + if(tTmp.txt=="disable") + { + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",12 + bTLeft.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTLeft.txt,"~",12 + tsw bTLeft,1 + bTLeft.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",16 + if(tTmp.txt=="disable") + { + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",13 + bTStop.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTStop.txt,"~",13 + tsw bTStop,1 + bTStop.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",9 + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,0 + bTRight.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,1 + bTRight.pco=65535 + } } if(tInstruction.txt=="dimmode") { // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="time") { @@ -781,7 +975,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 7 + ID : 6 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 84bdcc23..04c1e31e 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/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,12 +505,57 @@ Timer tmSerial tsw bDown1,1 bDown1.pco=65535 } + // set tTiltHeading (localization) + spstr strCommand.txt,tTiltHeading.txt,"~",11 + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",15 + if(tTmp.txt=="disable") + { + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",12 + bTLeft.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTLeft.txt,"~",12 + tsw bTLeft,1 + bTLeft.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",16 + if(tTmp.txt=="disable") + { + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",13 + bTStop.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTStop.txt,"~",13 + tsw bTStop,1 + bTStop.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",9 + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,0 + bTRight.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,1 + bTRight.pco=65535 + } } if(tInstruction.txt=="dimmode") { // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index a8fcb93c..6f767f5b 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 17:53:02.496648542 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:53:02.920648767 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:32:17.370968799 +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 17:53:02.496648542 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:53:02.920648767 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:32:17.374969002 +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 17:53:02.496648542 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:53:02.920648767 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:32:17.374969002 +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 17:53:02.496648542 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:53:02.920648767 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:32:17.374969002 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -538,234 +538,3 @@ 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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:53:02.920648767 +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=="dimmode") - { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 2a3a98b0..d5a57d89 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 17:53:02.932648774 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 17:53:02.496648542 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:53:02.920648767 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:53:02.496648542 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:53:02.920648767 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:32:17.386969613 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 20:32:16.934946602 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:32:17.370968799 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:32:17.374969002 +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 17:53:02.496648542 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:53:02.920648767 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:32:17.374969002 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,235 +59,5 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:53:02.496648542 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:53:02.920648767 +0000 -+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:53:02.920648767 +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=="dimmode") -+ { ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:32:17.374969002 +0000 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 b9d77b2a..855b7e49 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -2,6 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code +popupShutter + 25 Component(s) + 330 Line(s) of event code + 162 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -18,10 +22,6 @@ cardQR 32 Component(s) 374 Line(s) of event code 218 Unique line(s) of event code -popupShutter - 20 Component(s) - 248 Line(s) of event code - 141 Unique line(s) of event code popupNotify 17 Component(s) 204 Line(s) of event code @@ -57,6 +57,6 @@ pageStartup Total 13 Page(s) - 418 Component(s) - 4776 Line(s) of event code - 1270 Unique line(s) of event code + 423 Component(s) + 4858 Line(s) of event code + 1292 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 47af2b27..b897e25b 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/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 @@ -68,8 +92,8 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 60 - y coordinate : 21 + x coordinate : 68 + y coordinate : 48 Width : 195 Height : 30 Effect : load @@ -98,8 +122,8 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 11 - y coordinate : 35 + x coordinate : 15 + y coordinate : 63 Width : 45 Height : 30 Effect : load @@ -130,7 +154,7 @@ Text tSend Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 300 + Width : 72 Height : 22 Effect : load Effect Priority : 0 @@ -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 : 283 - y coordinate : 411 - 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 : 5 - y coordinate : 411 - 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 : 105 - y coordinate : 411 - 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 : 106 - y coordinate : 273 + x coordinate : 11 + y coordinate : 183 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 : 61 - y coordinate : 51 + x coordinate : 68 + 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 : 11 + y coordinate : 335 + 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,15 +283,59 @@ 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 : 35 - y coordinate : 304 - Width : 250 + x coordinate : 12 + y coordinate : 213 + Width : 300 + 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 : 12 + y coordinate : 365 + Width : 300 Height : 43 Effect : load Effect Priority : 0 @@ -369,8 +377,8 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 266 - y coordinate : 14 + x coordinate : 264 + y coordinate : 8 Width : 50 Height : 50 Effect : load @@ -410,16 +418,16 @@ 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 : 199 - y coordinate : 156 - Width : 70 - Height : 70 + x coordinate : 251 + y coordinate : 138 + Width : 60 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -457,16 +465,16 @@ 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 : 125 - y coordinate : 156 - Width : 70 - Height : 70 + x coordinate : 188 + y coordinate : 138 + Width : 60 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -504,16 +512,16 @@ 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 : 51 - y coordinate : 156 - Width : 70 - Height : 70 + x coordinate : 125 + y coordinate : 138 + Width : 60 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -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 : 125 + y coordinate : 291 + Width : 60 + Height : 60 + 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 : 187 + y coordinate : 291 + Width : 60 + Height : 60 + 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 : 249 + y coordinate : 291 + Width : 60 + Height : 60 + 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,47 @@ Timer tmSerial tsw bDown1,1 bDown1.pco=65535 } + // set tTiltHeading (localization) + spstr strCommand.txt,tTiltHeading.txt,"~",11 + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",15 + if(tTmp.txt=="disable") + { + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",12 + bTLeft.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTLeft.txt,"~",12 + tsw bTLeft,1 + bTLeft.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",16 + if(tTmp.txt=="disable") + { + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",13 + bTStop.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTStop.txt,"~",13 + tsw bTStop,1 + bTStop.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",9 + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,0 + bTRight.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,1 + bTRight.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -785,7 +975,7 @@ Timer tmSerial TouchCap tc0 Attributes - ID : 7 + ID : 6 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 13d22206..04c1e31e 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/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,47 @@ Timer tmSerial tsw bDown1,1 bDown1.pco=65535 } + // set tTiltHeading (localization) + spstr strCommand.txt,tTiltHeading.txt,"~",11 + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",15 + if(tTmp.txt=="disable") + { + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",12 + bTLeft.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTLeft.txt,"~",12 + tsw bTLeft,1 + bTLeft.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",16 + if(tTmp.txt=="disable") + { + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",13 + bTStop.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTStop.txt,"~",13 + tsw bTStop,1 + bTStop.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",9 + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,0 + bTRight.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,1 + bTRight.pco=65535 + } } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 4c3e2a07..6256bab1 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -36,8 +36,8 @@ pageStartup 117 Unique line(s) of event code popupShutter 25 Component(s) - 294 Line(s) of event code - 145 Unique line(s) of event code + 330 Line(s) of event code + 162 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 412 Component(s) - 4607 Line(s) of event code - 1218 Unique line(s) of event code + 4643 Line(s) of event code + 1233 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 77c46375..73038c25 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -836,6 +836,45 @@ Timer tmSerial } // set tTiltHeading (localization) spstr strCommand.txt,tTiltHeading.txt,"~",11 + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",15 + if(tTmp.txt=="disable") + { + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",12 + bTLeft.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTLeft.txt,"~",12 + tsw bTLeft,1 + bTLeft.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",16 + if(tTmp.txt=="disable") + { + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",13 + bTStop.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTStop.txt,"~",13 + tsw bTStop,1 + bTStop.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",9 + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,0 + bTRight.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,1 + bTRight.pco=65535 + } } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 68dd77b6..04c1e31e 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -507,6 +507,45 @@ Timer tmSerial } // set tTiltHeading (localization) spstr strCommand.txt,tTiltHeading.txt,"~",11 + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",15 + if(tTmp.txt=="disable") + { + tsw bTLeft,0 + spstr strCommand.txt,bTLeft.txt,"~",12 + bTLeft.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTLeft.txt,"~",12 + tsw bTLeft,1 + bTLeft.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",16 + if(tTmp.txt=="disable") + { + tsw bTStop,0 + spstr strCommand.txt,bTStop.txt,"~",13 + bTStop.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTStop.txt,"~",13 + tsw bTStop,1 + bTStop.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",9 + if(tTmp.txt=="disable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,0 + bTRight.pco=27501 + }else if(tTmp.txt=="enable") + { + spstr strCommand.txt,bTRight.txt,"~",14 + tsw bTRight,1 + bTRight.pco=65535 + } } if(tInstruction.txt=="dimmode") {