diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 460ae9da..7894b120 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-29 08:19:54.588517083 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 08:19:55.032517544 +0000 @@ -5,11 +5,24 @@ int recvCrc=0 int payloadLength=0 @@ -29,8 +29,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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 08:19:55.032517544 +0000 @@ -16,6 +16,7 @@ vis p0,0 vis tSend,0 @@ -454,41 +454,34 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Value: 0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 08:02:34.038739908 +0000 -@@ -31,7 +31,6 @@ - vis tIcon1,0 - vis tEntity1,0 - vis bText1,0 -- vis hSlider1,0 - //ui e2 - vis btOnOff2,0 - vis bUp2,0 -@@ -40,7 +39,6 @@ - vis tIcon2,0 - vis tEntity2,0 - vis bText2,0 -- vis hSlider2,0 - //ui e3 - vis btOnOff3,0 - vis bUp3,0 -@@ -49,7 +47,6 @@ - vis tIcon3,0 - vis tEntity3,0 - vis bText3,0 -- vis hSlider3,0 - //ui e4 - vis btOnOff4,0 - vis bUp4,0 -@@ -58,7 +55,6 @@ - vis tIcon4,0 +--- HMI/n2t-out/cardEntities.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 08:19:55.032517544 +0000 +@@ -59,6 +59,24 @@ vis tEntity4,0 vis bText4,0 -- vis hSlider4,0 + vis hSlider4,0 ++ //ui e5 ++ vis btOnOff5,0 ++ vis bUp5,0 ++ vis bStop5,0 ++ vis bDown5,0 ++ vis tIcon5,0 ++ vis tEntity5,0 ++ vis bText5,0 ++ vis hSlider5,0 ++ //ui e6 ++ vis btOnOff6,0 ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis tIcon6,0 ++ vis tEntity6,0 ++ vis bText6,0 ++ vis hSlider6,0 Variable (string) strCommand Attributes -@@ -100,28 +96,56 @@ +@@ -100,28 +118,56 @@ ID : 49 Scope : local Text : @@ -549,87 +542,116 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Text tHeading Attributes -@@ -266,57 +290,57 @@ +@@ -266,6 +312,50 @@ Text : Max. Text Size : 50 --Picture p0 +Text tEntity5 - Attributes -- ID : 1 ++ Attributes + ID : 54 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled + Associated Keyboard : none + Text : tEntity5 + Max. Text Size : 30 - --Slider hSlider1 ++ +Text tIcon5 - Attributes -- ID : 54 ++ Attributes + ID : 55 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled -- Position : 50 -- Upper range limit : 100 -- Lower range limit : 0 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 30 - --Slider hSlider2 ++ +Text tEntity6 - Attributes -- ID : 55 ++ Attributes + ID : 62 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled -- Position : 50 -- Upper range limit : 100 -- Lower range limit : 0 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled + Associated Keyboard : none + Text : tEntity6 + Max. Text Size : 30 - --Slider hSlider3 ++ +Text tIcon6 - Attributes -- ID : 56 ++ Attributes + ID : 63 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled -- Position : 50 -- Upper range limit : 100 -- Lower range limit : 0 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 30 - --Slider hSlider4 -+Picture p0 ++ + Picture p0 Attributes -- ID : 57 -+ ID : 1 + ID : 1 +@@ -276,7 +366,7 @@ + + Slider hSlider1 + Attributes +- ID : 54 ++ ID : 74 Scope : local Dragging : 0 Disable release event after dragging: 0 - Send Component ID : disabled -- Position : 50 -- Upper range limit : 100 -- Lower range limit : 0 +@@ -287,7 +377,7 @@ - Button bDown1 + Slider hSlider2 Attributes -@@ -643,7 +667,13 @@ +- ID : 55 ++ ID : 75 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -298,7 +388,7 @@ + + Slider hSlider3 + Attributes +- ID : 56 ++ ID : 76 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -309,7 +399,29 @@ + + Slider hSlider4 + Attributes +- ID : 57 ++ ID : 77 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Position : 50 ++ Upper range limit : 100 ++ Lower range limit : 0 ++ ++Slider hSlider5 ++ Attributes ++ ID : 78 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Position : 50 ++ Upper range limit : 100 ++ Lower range limit : 0 ++ ++Slider hSlider6 ++ Attributes ++ ID : 79 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -643,7 +755,13 @@ Events Touch Press Event @@ -644,7 +666,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -669,7 +699,13 @@ +@@ -669,7 +787,13 @@ Events Touch Press Event @@ -659,7 +681,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -786,6 +822,214 @@ +@@ -786,6 +910,214 @@ prints tSend.txt,0 prints crcval,2 @@ -874,7 +896,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes ID : 23 -@@ -898,6 +1142,62 @@ +@@ -898,6 +1230,62 @@ prints tSend.txt,0 prints crcval,2 @@ -937,7 +959,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes ID : 35 -@@ -1008,6 +1308,52 @@ +@@ -1008,6 +1396,52 @@ page popupLight } @@ -990,490 +1012,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes ID : 30 -@@ -1060,15 +1406,18 @@ - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 -- if(tInstruction.txt=="entityUpd") -+ if(tInstruction.txt=="entityUpdHeading") - { -- // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,",",1 -+ } -+ if(tInstruction.txt=="entityUpd") -+ { -+ // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4 - // get Type -- spstr strCommand.txt,type1.txt,",",3 -+ spstr strCommand.txt,type1.txt,",",1 - // get internal name -- spstr strCommand.txt,entn1.txt,",",4 -- if(type1.txt=="delete"||type1.txt=="") -+ spstr strCommand.txt,entn1.txt,",",2 -+ if(type1.txt=="delete") - { - vis bUp1,0 - vis bStop1,0 -@@ -1077,20 +1426,19 @@ - vis tEntity1,0 - vis tIcon1,0 - vis bText1,0 -- vis hSlider1,0 - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",5 -+ spstr strCommand.txt,tTmp.txt,",",3 +@@ -1528,6 +1962,238 @@ covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 - vis tIcon1,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",6 -+ spstr strCommand.txt,tTmp.txt,",",4 - covx tTmp.txt,sys0,0,0 - tIcon1.pco=sys0 - // set name -- spstr strCommand.txt,tEntity1.txt,",",7 -+ spstr strCommand.txt,tEntity1.txt,",",5 - vis tEntity1,1 + hSlider4.maxval=sys0 } - if(type1.txt=="shutter") -@@ -1100,7 +1448,6 @@ - vis bDown1,1 - vis btOnOff1,0 - vis bText1,0 -- vis hSlider1,0 - } - if(type1.txt=="light") - { -@@ -1109,9 +1456,8 @@ - vis bDown1,0 - vis btOnOff1,1 - vis bText1,0 -- vis hSlider1,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",8 -+ spstr strCommand.txt,tTmp.txt,",",6 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - } -@@ -1122,9 +1468,8 @@ - vis bDown1,0 - vis btOnOff1,1 - vis bText1,0 -- vis hSlider1,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",8 -+ spstr strCommand.txt,tTmp.txt,",",6 - covx tTmp.txt,sys0,0,0 - btOnOff1.val=sys0 - } -@@ -1136,11 +1481,10 @@ - vis btOnOff1,0 - vis bText1,1 - tsw bText1,0 -- vis hSlider1,0 - bText1.pco=65535 - bText1.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,",",8 -+ spstr strCommand.txt,bText1.txt,",",6 - } - if(type1.txt=="button") - { -@@ -1150,41 +1494,17 @@ - vis btOnOff1,0 - vis bText1,1 - tsw bText1,1 -- vis hSlider1,0 - bText1.pco=1374 - bText1.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,",",8 -- } -- if(type1.txt=="number") -- { -- vis bUp1,0 -- vis bStop1,0 -- vis bDown1,0 -- vis btOnOff1,0 -- vis bText1,0 -- tsw bText1,0 -- vis hSlider1,1 -- // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText1.txt,",",8 -- //first value is current value -- spstr bText1.txt,tTmp.txt,"|",1 -- covx tTmp.txt,sys0,0,0 -- hSlider1.val=sys0 -- //second value is min value -- spstr bText1.txt,tTmp.txt,"|",2 -- covx tTmp.txt,sys0,0,0 -- hSlider1.minval=sys0 -- //third value is max value -- spstr bText1.txt,tTmp.txt,"|",3 -- covx tTmp.txt,sys0,0,0 -- hSlider1.maxval=sys0 -+ spstr strCommand.txt,bText1.txt,",",6 - } -+ // id2 - // get Type -- spstr strCommand.txt,type2.txt,",",9 -+ spstr strCommand.txt,type2.txt,",",7 - // get internal name -- spstr strCommand.txt,entn2.txt,",",10 -- if(type2.txt=="delete"||type2.txt=="") -+ spstr strCommand.txt,entn2.txt,",",8 -+ if(type2.txt=="delete") - { - vis bUp2,0 - vis bStop2,0 -@@ -1193,20 +1513,19 @@ - vis tEntity2,0 - vis tIcon2,0 - vis bText2,0 -- vis hSlider2,0 - }else - { -- // change icon -- spstr strCommand.txt,tTmp.txt,",",11 -+ //change icon -+ spstr strCommand.txt,tTmp.txt,",",9 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 - vis tIcon2,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",12 -+ spstr strCommand.txt,tTmp.txt,",",10 - covx tTmp.txt,sys0,0,0 - tIcon2.pco=sys0 - // set name -- spstr strCommand.txt,tEntity2.txt,",",13 -+ spstr strCommand.txt,tEntity2.txt,",",11 - vis tEntity2,1 - } - if(type2.txt=="shutter") -@@ -1216,7 +1535,6 @@ - vis bDown2,1 - vis btOnOff2,0 - vis bText2,0 -- vis hSlider2,0 - } - if(type2.txt=="light") - { -@@ -1225,9 +1543,8 @@ - vis bDown2,0 - vis btOnOff2,1 - vis bText2,0 -- vis hSlider2,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",14 -+ spstr strCommand.txt,tTmp.txt,",",12 - covx tTmp.txt,sys0,0,0 - btOnOff2.val=sys0 - } -@@ -1238,9 +1555,8 @@ - vis bDown2,0 - vis btOnOff2,1 - vis bText2,0 -- vis hSlider2,0 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",14 -+ spstr strCommand.txt,tTmp.txt,",",12 - covx tTmp.txt,sys0,0,0 - btOnOff2.val=sys0 - } -@@ -1252,11 +1568,10 @@ - vis btOnOff2,0 - vis bText2,1 - tsw bText2,0 -- vis hSlider2,0 - bText2.pco=65535 - bText2.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,",",14 -+ spstr strCommand.txt,bText2.txt,",",12 - } - if(type2.txt=="button") - { -@@ -1266,41 +1581,17 @@ - vis btOnOff2,0 - vis bText2,1 - tsw bText2,1 -- vis hSlider2,0 - bText2.pco=1374 - bText2.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,",",14 -- } -- if(type2.txt=="number") -- { -- vis bUp2,0 -- vis bStop2,0 -- vis bDown2,0 -- vis btOnOff2,0 -- vis bText2,0 -- tsw bText2,0 -- vis hSlider2,1 -- // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText2.txt,",",14 -- //first value is current value -- spstr bText2.txt,tTmp.txt,"|",1 -- covx tTmp.txt,sys0,0,0 -- hSlider2.val=sys0 -- //second value is min value -- spstr bText2.txt,tTmp.txt,"|",2 -- covx tTmp.txt,sys0,0,0 -- hSlider2.minval=sys0 -- //third value is max value -- spstr bText2.txt,tTmp.txt,"|",3 -- covx tTmp.txt,sys0,0,0 -- hSlider2.maxval=sys0 -+ spstr strCommand.txt,bText2.txt,",",12 - } -+ // id3 - // get Type -- spstr strCommand.txt,type3.txt,",",15 -+ spstr strCommand.txt,type3.txt,",",13 - // get internal name -- spstr strCommand.txt,entn3.txt,",",16 -- if(type3.txt=="delete"||type3.txt=="") -+ spstr strCommand.txt,entn3.txt,",",14 -+ if(type3.txt=="delete") - { - vis bUp3,0 - vis bStop3,0 -@@ -1309,20 +1600,19 @@ - vis tEntity3,0 - vis tIcon3,0 - vis bText3,0 -- vis hSlider3,0 - }else - { -- // change icon -- spstr strCommand.txt,tTmp.txt,",",17 -+ //change icon -+ spstr strCommand.txt,tTmp.txt,",",15 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 - vis tIcon3,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",18 -+ spstr strCommand.txt,tTmp.txt,",",16 - covx tTmp.txt,sys0,0,0 - tIcon3.pco=sys0 - // set name -- spstr strCommand.txt,tEntity3.txt,",",19 -+ spstr strCommand.txt,tEntity3.txt,",",17 - vis tEntity3,1 - } - if(type3.txt=="shutter") -@@ -1332,18 +1622,16 @@ - vis bDown3,1 - vis btOnOff3,0 - vis bText3,0 -- vis hSlider3,0 - } - if(type3.txt=="light") - { - vis bUp3,0 - vis bStop3,0 - vis bDown3,0 -- vis btOnOff3,1 - vis bText3,0 -- vis hSlider3,0 -+ vis btOnOff3,1 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",20 -+ spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,sys0,0,0 - btOnOff3.val=sys0 - } -@@ -1352,11 +1640,10 @@ - vis bUp3,0 - vis bStop3,0 - vis bDown3,0 -- vis btOnOff3,1 - vis bText3,0 -- vis hSlider3,0 -+ vis btOnOff3,1 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",20 -+ spstr strCommand.txt,tTmp.txt,",",18 - covx tTmp.txt,sys0,0,0 - btOnOff3.val=sys0 - } -@@ -1368,11 +1655,10 @@ - vis btOnOff3,0 - vis bText3,1 - tsw bText3,0 -- vis hSlider3,0 - bText3.pco=65535 - bText3.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText3.txt,",",20 -+ spstr strCommand.txt,bText3.txt,",",18 - } - if(type3.txt=="button") - { -@@ -1382,41 +1668,17 @@ - vis btOnOff3,0 - vis bText3,1 - tsw bText3,1 -- vis hSlider3,0 - bText3.pco=1374 - bText3.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText3.txt,",",20 -- } -- if(type3.txt=="number") -- { -- vis bUp3,0 -- vis bStop3,0 -- vis bDown3,0 -- vis btOnOff3,0 -- vis bText3,0 -- tsw bText3,0 -- vis hSlider3,1 -- // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText3.txt,",",20 -- //first value is current value -- spstr bText3.txt,tTmp.txt,"|",1 -- covx tTmp.txt,sys0,0,0 -- hSlider3.val=sys0 -- //second value is min value -- spstr bText3.txt,tTmp.txt,"|",2 -- covx tTmp.txt,sys0,0,0 -- hSlider3.minval=sys0 -- //third value is max value -- spstr bText3.txt,tTmp.txt,"|",3 -- covx tTmp.txt,sys0,0,0 -- hSlider3.maxval=sys0 -+ spstr strCommand.txt,bText3.txt,",",18 - } -+ // id4 - // get Type -- spstr strCommand.txt,type4.txt,",",21 -+ spstr strCommand.txt,type4.txt,",",19 - // get internal name -- spstr strCommand.txt,entn4.txt,",",22 -- if(type4.txt=="delete"||type4.txt=="") -+ spstr strCommand.txt,entn4.txt,",",20 -+ if(type4.txt=="delete") - { - vis bUp4,0 - vis bStop4,0 -@@ -1425,20 +1687,19 @@ - vis tEntity4,0 - vis tIcon4,0 - vis bText4,0 -- vis hSlider4,0 - }else - { -- // change icon -- spstr strCommand.txt,tTmp.txt,",",23 -+ //change icon -+ spstr strCommand.txt,tTmp.txt,",",21 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 - vis tIcon4,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",24 -+ spstr strCommand.txt,tTmp.txt,",",22 - covx tTmp.txt,sys0,0,0 - tIcon4.pco=sys0 - // set name -- spstr strCommand.txt,tEntity4.txt,",",25 -+ spstr strCommand.txt,tEntity4.txt,",",23 - vis tEntity4,1 - } - if(type4.txt=="shutter") -@@ -1448,18 +1709,16 @@ - vis bDown4,1 - vis btOnOff4,0 - vis bText4,0 -- vis hSlider4,0 - } - if(type4.txt=="light") - { - vis bUp4,0 - vis bStop4,0 - vis bDown4,0 -- vis btOnOff4,1 - vis bText4,0 -- vis hSlider4,0 -+ vis btOnOff4,1 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",26 -+ spstr strCommand.txt,tTmp.txt,",",24 - covx tTmp.txt,sys0,0,0 - btOnOff4.val=sys0 - } -@@ -1468,11 +1727,10 @@ - vis bUp4,0 - vis bStop4,0 - vis bDown4,0 -- vis btOnOff4,1 - vis bText4,0 -- vis hSlider4,0 -+ vis btOnOff4,1 - // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,",",26 -+ spstr strCommand.txt,tTmp.txt,",",24 - covx tTmp.txt,sys0,0,0 - btOnOff4.val=sys0 - } -@@ -1484,11 +1742,10 @@ - vis btOnOff4,0 - vis bText4,1 - tsw bText4,0 -- vis hSlider4,0 - bText4.pco=65535 - bText4.pco2=65535 - // get Text (optional Value) -- spstr strCommand.txt,bText4.txt,",",26 -+ spstr strCommand.txt,bText4.txt,",",24 - } - if(type4.txt=="button") - { -@@ -1498,35 +1755,184 @@ - vis btOnOff4,0 - vis bText4,1 - tsw bText4,1 -- vis hSlider4,0 - bText4.pco=1374 - bText4.pco2=1374 - // get Text (optional Value) -- spstr strCommand.txt,bText4.txt,",",26 -+ spstr strCommand.txt,bText4.txt,",",24 - } -- if(type4.txt=="number") -+ // id5 + // get Type -+ spstr strCommand.txt,type5.txt,",",25 ++ spstr strCommand.txt,type5.txt,",",27 + // get internal name -+ spstr strCommand.txt,entn5.txt,",",26 -+ if(type5.txt=="delete") - { -- vis bUp4,0 -- vis bStop4,0 -- vis bDown4,0 -- vis btOnOff4,0 -- vis bText4,0 -- tsw bText4,0 -- vis hSlider4,1 -- // get config (optional Value) (use bText as variable) -- spstr strCommand.txt,bText4.txt,",",26 -- //first value is current value -- spstr bText4.txt,tTmp.txt,"|",1 -- covx tTmp.txt,sys0,0,0 -- hSlider4.val=sys0 -- //second value is min value -- spstr bText4.txt,tTmp.txt,"|",2 -- covx tTmp.txt,sys0,0,0 -- hSlider4.minval=sys0 -- //third value is max value -- spstr bText4.txt,tTmp.txt,"|",3 ++ spstr strCommand.txt,entn5.txt,",",28 ++ if(type5.txt=="delete"||type5.txt=="") ++ { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 @@ -1481,20 +1029,20 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis tEntity5,0 + vis tIcon5,0 + vis bText5,0 ++ vis hSlider5,0 + }else + { -+ //change icon -+ spstr strCommand.txt,tTmp.txt,",",27 - covx tTmp.txt,sys0,0,0 -- hSlider4.maxval=sys0 ++ // change icon ++ spstr strCommand.txt,tTmp.txt,",",29 ++ covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 + vis tIcon5,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,",",28 ++ spstr strCommand.txt,tTmp.txt,",",30 + covx tTmp.txt,sys0,0,0 + tIcon5.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity5.txt,",",29 ++ spstr strCommand.txt,tEntity5.txt,",",31 + vis tEntity5,1 + } + if(type5.txt=="shutter") @@ -1504,16 +1052,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bDown5,1 + vis btOnOff5,0 + vis bText5,0 ++ vis hSlider5,0 + } + if(type5.txt=="light") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 -+ vis bText5,0 + vis btOnOff5,1 ++ vis bText5,0 ++ vis hSlider5,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",30 ++ spstr strCommand.txt,tTmp.txt,",",32 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } @@ -1522,10 +1072,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 -+ vis bText5,0 + vis btOnOff5,1 ++ vis bText5,0 ++ vis hSlider5,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",30 ++ spstr strCommand.txt,tTmp.txt,",",32 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } @@ -1537,10 +1088,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff5,0 + vis bText5,1 + tsw bText5,0 ++ vis hSlider5,0 + bText5.pco=65535 + bText5.pco2=65535 + // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,",",30 ++ spstr strCommand.txt,bText5.txt,",",32 + } + if(type5.txt=="button") + { @@ -1550,17 +1102,41 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff5,0 + vis bText5,1 + tsw bText5,1 ++ vis hSlider5,0 + bText5.pco=1374 + bText5.pco2=1374 + // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,",",30 ++ spstr strCommand.txt,bText5.txt,",",32 ++ } ++ if(type5.txt=="number") ++ { ++ vis bUp5,0 ++ vis bStop5,0 ++ vis bDown5,0 ++ vis btOnOff5,0 ++ vis bText5,0 ++ tsw bText5,0 ++ vis hSlider5,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText5.txt,",",32 ++ //first value is current value ++ spstr bText5.txt,tTmp.txt,"|",1 ++ covx tTmp.txt,sys0,0,0 ++ hSlider5.val=sys0 ++ //second value is min value ++ spstr bText5.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider5.minval=sys0 ++ //third value is max value ++ spstr bText5.txt,tTmp.txt,"|",3 ++ covx tTmp.txt,sys0,0,0 ++ hSlider5.maxval=sys0 + } -+ // id6 + // get Type -+ spstr strCommand.txt,type6.txt,",",31 ++ spstr strCommand.txt,type6.txt,",",33 + // get internal name -+ spstr strCommand.txt,entn6.txt,",",32 -+ if(type6.txt=="delete") ++ spstr strCommand.txt,entn6.txt,",",34 ++ if(type6.txt=="delete"||type6.txt=="") + { + vis bUp6,0 + vis bStop6,0 @@ -1569,19 +1145,20 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis tEntity6,0 + vis tIcon6,0 + vis bText6,0 ++ vis hSlider6,0 + }else + { -+ //change icon -+ spstr strCommand.txt,tTmp.txt,",",33 ++ // change icon ++ spstr strCommand.txt,tTmp.txt,",",35 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 + vis tIcon6,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,",",34 ++ spstr strCommand.txt,tTmp.txt,",",36 + covx tTmp.txt,sys0,0,0 + tIcon6.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity6.txt,",",35 ++ spstr strCommand.txt,tEntity6.txt,",",37 + vis tEntity6,1 + } + if(type6.txt=="shutter") @@ -1591,16 +1168,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bDown6,1 + vis btOnOff6,0 + vis bText6,0 ++ vis hSlider6,0 + } + if(type6.txt=="light") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 -+ vis bText6,0 + vis btOnOff6,1 ++ vis bText6,0 ++ vis hSlider6,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",36 ++ spstr strCommand.txt,tTmp.txt,",",38 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } @@ -1609,10 +1188,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 -+ vis bText6,0 + vis btOnOff6,1 ++ vis bText6,0 ++ vis hSlider6,0 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",36 ++ spstr strCommand.txt,tTmp.txt,",",38 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } @@ -1624,10 +1204,11 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff6,0 + vis bText6,1 + tsw bText6,0 ++ vis hSlider6,0 + bText6.pco=65535 + bText6.pco2=65535 + // get Text (optional Value) -+ spstr strCommand.txt,bText6.txt,",",36 ++ spstr strCommand.txt,bText6.txt,",",38 + } + if(type6.txt=="button") + { @@ -1637,71 +1218,42 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff6,0 + vis bText6,1 + tsw bText6,1 ++ vis hSlider6,0 + bText6.pco=1374 + bText6.pco2=1374 + // get Text (optional Value) -+ spstr strCommand.txt,bText6.txt,",",36 - } ++ spstr strCommand.txt,bText6.txt,",",38 ++ } ++ if(type6.txt=="number") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,0 ++ tsw bText6,0 ++ vis hSlider6,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText6.txt,",",38 ++ //first value is current value ++ spstr bText6.txt,tTmp.txt,"|",1 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.val=sys0 ++ //second value is min value ++ spstr bText6.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.minval=sys0 ++ //third value is max value ++ spstr bText6.txt,tTmp.txt,"|",3 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.maxval=sys0 ++ } } if(tInstruction.txt=="pageType") -@@ -1541,43 +1947,30 @@ - //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... - udelete payloadLength-1 - bufferPos=0 -- if(tId.txt=="pageStartup") -- { -- page pageStartup -- } -- if(tId.txt=="screensaver") -- { -- page screensaver -- } -- if(tId.txt=="cardEntities") -+ if(tId.txt=="popupLight") - { -- page cardEntities -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupLight - } -- if(tId.txt=="cardGrid") -+ if(tId.txt=="cardThermo") - { -- page cardGrid -+ page cardThermo - } -- if(tId.txt=="popupLight") -+ if(tId.txt=="cardMedia") - { -- pageIcons.tTmp1.txt=tTmp.txt -- page popupLight -+ page cardMedia - } -- if(tId.txt=="popupShutter") -+ if(tId.txt=="pageStartup") - { -- pageIcons.tTmp1.txt=tTmp.txt -- page popupShutter -+ page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } -- if(tId.txt=="cardThermo") -- { -- page cardThermo -- } -- if(tId.txt=="cardMedia") -+ if(tId.txt=="cardGrid") - { -- page cardMedia -+ page cardGrid - } - if(tId.txt=="cardAlarm") - { + { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 08:19:55.032517544 +0000 @@ -76,28 +76,28 @@ ID : 18 Scope : local @@ -1765,246 +1317,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -600,14 +612,17 @@ - ucopy strCommand.txt,4,payloadLength-5,0 - // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 -- if(tInstruction.txt=="entityUpd") -+ if(tInstruction.txt=="entityUpdHeading") - { -- // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 - spstr strCommand.txt,tHeading.txt,",",1 -+ } -+ if(tInstruction.txt=="entityUpd") -+ { -+ // command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 - // get Type -- spstr strCommand.txt,type1.txt,",",3 -+ spstr strCommand.txt,type1.txt,",",1 - // get internal name -- spstr strCommand.txt,entn1.txt,",",4 -+ spstr strCommand.txt,entn1.txt,",",2 - if(type1.txt=="delete"||type1.txt=="") - { - vis tEntity1,0 -@@ -615,22 +630,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",5 -+ spstr strCommand.txt,tTmp.txt,",",3 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 - vis bEntity1,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",6 -+ spstr strCommand.txt,tTmp.txt,",",4 - covx tTmp.txt,sys0,0,0 - bEntity1.pco=sys0 - // set name -- spstr strCommand.txt,tEntity1.txt,",",7 -+ spstr strCommand.txt,tEntity1.txt,",",5 - vis tEntity1,1 - } - // get Type -- spstr strCommand.txt,type2.txt,",",9 -+ spstr strCommand.txt,type2.txt,",",7 - // get internal name -- spstr strCommand.txt,entn2.txt,",",10 -+ spstr strCommand.txt,entn2.txt,",",8 - if(type2.txt=="delete"||type2.txt=="") - { - vis tEntity2,0 -@@ -638,22 +653,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",11 -+ spstr strCommand.txt,tTmp.txt,",",9 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 - vis bEntity2,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",12 -+ spstr strCommand.txt,tTmp.txt,",",10 - covx tTmp.txt,sys0,0,0 - bEntity2.pco=sys0 - // set name -- spstr strCommand.txt,tEntity2.txt,",",13 -+ spstr strCommand.txt,tEntity2.txt,",",11 - vis tEntity2,1 - } - // get Type -- spstr strCommand.txt,type3.txt,",",15 -+ spstr strCommand.txt,type3.txt,",",13 - // get internal name -- spstr strCommand.txt,entn3.txt,",",16 -+ spstr strCommand.txt,entn3.txt,",",14 - if(type3.txt=="delete"||type3.txt=="") - { - vis tEntity3,0 -@@ -661,22 +676,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",17 -+ spstr strCommand.txt,tTmp.txt,",",15 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 - vis bEntity3,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",18 -+ spstr strCommand.txt,tTmp.txt,",",16 - covx tTmp.txt,sys0,0,0 - bEntity3.pco=sys0 - // set name -- spstr strCommand.txt,tEntity3.txt,",",19 -+ spstr strCommand.txt,tEntity3.txt,",",17 - vis tEntity3,1 - } - // get Type -- spstr strCommand.txt,type4.txt,",",21 -+ spstr strCommand.txt,type4.txt,",",19 - // get internal name -- spstr strCommand.txt,entn4.txt,",",22 -+ spstr strCommand.txt,entn4.txt,",",20 - if(type4.txt=="delete"||type4.txt=="") - { - vis tEntity4,0 -@@ -684,22 +699,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",23 -+ spstr strCommand.txt,tTmp.txt,",",21 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 - vis bEntity4,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",24 -+ spstr strCommand.txt,tTmp.txt,",",22 - covx tTmp.txt,sys0,0,0 - bEntity4.pco=sys0 - // set name -- spstr strCommand.txt,tEntity4.txt,",",25 -+ spstr strCommand.txt,tEntity4.txt,",",23 - vis tEntity4,1 - } - // get Type -- spstr strCommand.txt,type5.txt,",",27 -+ spstr strCommand.txt,type5.txt,",",25 - // get internal name -- spstr strCommand.txt,entn5.txt,",",28 -+ spstr strCommand.txt,entn5.txt,",",26 - if(type5.txt=="delete"||type5.txt=="") - { - vis tEntity5,0 -@@ -707,22 +722,22 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",29 -+ spstr strCommand.txt,tTmp.txt,",",27 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 - vis bEntity5,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",30 -+ spstr strCommand.txt,tTmp.txt,",",28 - covx tTmp.txt,sys0,0,0 - bEntity5.pco=sys0 - // set name -- spstr strCommand.txt,tEntity5.txt,",",31 -+ spstr strCommand.txt,tEntity5.txt,",",29 - vis tEntity5,1 - } - // get Type -- spstr strCommand.txt,type6.txt,",",33 -+ spstr strCommand.txt,type6.txt,",",31 - // get internal name -- spstr strCommand.txt,entn6.txt,",",34 -+ spstr strCommand.txt,entn6.txt,",",32 - if(type6.txt=="delete"||type6.txt=="") - { - vis tEntity6,0 -@@ -730,16 +745,16 @@ - }else - { - // change icon -- spstr strCommand.txt,tTmp.txt,",",35 -+ spstr strCommand.txt,tTmp.txt,",",33 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 - vis bEntity6,1 - // change icon color -- spstr strCommand.txt,tTmp.txt,",",36 -+ spstr strCommand.txt,tTmp.txt,",",34 - covx tTmp.txt,sys0,0,0 - bEntity6.pco=sys0 - // set name -- spstr strCommand.txt,tEntity6.txt,",",37 -+ spstr strCommand.txt,tEntity6.txt,",",35 - vis tEntity6,1 - } - } -@@ -755,43 +770,30 @@ - //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... - udelete payloadLength-1 - bufferPos=0 -- if(tId.txt=="pageStartup") -- { -- page pageStartup -- } -- if(tId.txt=="screensaver") -- { -- page screensaver -- } -- if(tId.txt=="cardEntities") -+ if(tId.txt=="popupLight") - { -- page cardEntities -+ pageIcons.tTmp1.txt=tTmp.txt -+ page popupLight - } -- if(tId.txt=="cardGrid") -+ if(tId.txt=="cardThermo") - { -- page cardGrid -+ page cardThermo - } -- if(tId.txt=="popupLight") -+ if(tId.txt=="cardMedia") - { -- pageIcons.tTmp1.txt=tTmp.txt -- page popupLight -+ page cardMedia - } -- if(tId.txt=="popupShutter") -+ if(tId.txt=="pageStartup") - { -- pageIcons.tTmp1.txt=tTmp.txt -- page popupShutter -+ page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } -- if(tId.txt=="cardThermo") -- { -- page cardThermo -- } -- if(tId.txt=="cardMedia") -+ if(tId.txt=="cardEntities") - { -- page cardMedia -+ page cardEntities - } - if(tId.txt=="cardAlarm") - { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 08:19:55.032517544 +0000 @@ -16,37 +16,34 @@ vis p0,0 vis tSend,0 @@ -2434,8 +1749,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt Value: 0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 08:19:55.032517544 +0000 @@ -269,7 +269,14 @@ Events @@ -2469,8 +1784,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-29 08:19:54.588517083 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 08:19:55.032517544 +0000 @@ -30,8 +30,8 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -2483,8 +1798,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Text tTmp1 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 08:19:55.032517544 +0000 @@ -155,7 +155,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -2507,8 +1822,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt pageIcons.tTmp1.txt=tTmp.txt Only in HMI/US/portrait/n2t-out: pageSwipeTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/pageTest.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-03-29 08:19:55.032517544 +0000 @@ -53,7 +53,7 @@ Touch Press Event page pageSerialTest @@ -2613,8 +1928,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Dragging : 0 Disable release event after dragging: 0 diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/popupLight.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 08:19:55.032517544 +0000 @@ -252,8 +252,6 @@ Events @@ -2690,8 +2005,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Attributes ID : 14 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 08:19:55.032517544 +0000 @@ -127,7 +127,12 @@ Events Touch Press Event @@ -2707,8 +2022,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt 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-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 08:19:55.032517544 +0000 @@ -180,7 +180,12 @@ Events @@ -2724,8 +2039,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt 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-03-29 08:02:33.634746387 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 08:02:34.038739908 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-29 08:19:54.592517087 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 08:19:55.032517544 +0000 @@ -20,26 +20,12 @@ vis tTmp,0 vis p0,0 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 0794f475..e5042647 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -31,6 +31,7 @@ Page cardEntities vis tIcon1,0 vis tEntity1,0 vis bText1,0 + vis hSlider1,0 //ui e2 vis btOnOff2,0 vis bUp2,0 @@ -39,6 +40,7 @@ Page cardEntities vis tIcon2,0 vis tEntity2,0 vis bText2,0 + vis hSlider2,0 //ui e3 vis btOnOff3,0 vis bUp3,0 @@ -47,6 +49,7 @@ Page cardEntities vis tIcon3,0 vis tEntity3,0 vis bText3,0 + vis hSlider3,0 //ui e4 vis btOnOff4,0 vis bUp4,0 @@ -55,6 +58,25 @@ Page cardEntities vis tIcon4,0 vis tEntity4,0 vis bText4,0 + vis hSlider4,0 + //ui e5 + vis btOnOff5,0 + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis tIcon5,0 + vis tEntity5,0 + vis bText5,0 + vis hSlider5,0 + //ui e6 + vis btOnOff6,0 + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis tIcon6,0 + vis tEntity6,0 + vis bText6,0 + vis hSlider6,0 Variable (string) strCommand Attributes @@ -342,6 +364,72 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled +Slider hSlider1 + Attributes + ID : 74 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider2 + Attributes + ID : 75 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider3 + Attributes + ID : 76 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider4 + Attributes + ID : 77 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider5 + Attributes + ID : 78 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider6 + Attributes + ID : 79 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + Button bDown1 Attributes ID : 11 @@ -1406,18 +1494,15 @@ Timer tmSerial ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdHeading") - { - spstr strCommand.txt,tHeading.txt,",",1 - } if(tInstruction.txt=="entityUpd") { - // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4 + // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 + spstr strCommand.txt,tHeading.txt,",",1 // get Type - spstr strCommand.txt,type1.txt,",",1 + spstr strCommand.txt,type1.txt,",",3 // get internal name - spstr strCommand.txt,entn1.txt,",",2 - if(type1.txt=="delete") + spstr strCommand.txt,entn1.txt,",",4 + if(type1.txt=="delete"||type1.txt=="") { vis bUp1,0 vis bStop1,0 @@ -1426,19 +1511,20 @@ Timer tmSerial vis tEntity1,0 vis tIcon1,0 vis bText1,0 + vis hSlider1,0 }else { // change icon - spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,",",5 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",5 + spstr strCommand.txt,tEntity1.txt,",",7 vis tEntity1,1 } if(type1.txt=="shutter") @@ -1448,6 +1534,7 @@ Timer tmSerial vis bDown1,1 vis btOnOff1,0 vis bText1,0 + vis hSlider1,0 } if(type1.txt=="light") { @@ -1456,8 +1543,9 @@ Timer tmSerial vis bDown1,0 vis btOnOff1,1 vis bText1,0 + vis hSlider1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1468,8 +1556,9 @@ Timer tmSerial vis bDown1,0 vis btOnOff1,1 vis bText1,0 + vis hSlider1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",8 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1481,10 +1570,11 @@ Timer tmSerial vis btOnOff1,0 vis bText1,1 tsw bText1,0 + vis hSlider1,0 bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",6 + spstr strCommand.txt,bText1.txt,",",8 } if(type1.txt=="button") { @@ -1494,17 +1584,41 @@ Timer tmSerial vis btOnOff1,0 vis bText1,1 tsw bText1,1 + vis hSlider1,0 bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",6 + spstr strCommand.txt,bText1.txt,",",8 + } + if(type1.txt=="number") + { + vis bUp1,0 + vis bStop1,0 + vis bDown1,0 + vis btOnOff1,0 + vis bText1,0 + tsw bText1,0 + vis hSlider1,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText1.txt,",",8 + //first value is current value + spstr bText1.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider1.val=sys0 + //second value is min value + spstr bText1.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider1.minval=sys0 + //third value is max value + spstr bText1.txt,tTmp.txt,"|",3 + covx tTmp.txt,sys0,0,0 + hSlider1.maxval=sys0 } - // id2 // get Type - spstr strCommand.txt,type2.txt,",",7 + spstr strCommand.txt,type2.txt,",",9 // get internal name - spstr strCommand.txt,entn2.txt,",",8 - if(type2.txt=="delete") + spstr strCommand.txt,entn2.txt,",",10 + if(type2.txt=="delete"||type2.txt=="") { vis bUp2,0 vis bStop2,0 @@ -1513,19 +1627,20 @@ Timer tmSerial vis tEntity2,0 vis tIcon2,0 vis bText2,0 + vis hSlider2,0 }else { - //change icon - spstr strCommand.txt,tTmp.txt,",",9 + // change icon + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",10 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",11 + spstr strCommand.txt,tEntity2.txt,",",13 vis tEntity2,1 } if(type2.txt=="shutter") @@ -1535,6 +1650,7 @@ Timer tmSerial vis bDown2,1 vis btOnOff2,0 vis bText2,0 + vis hSlider2,0 } if(type2.txt=="light") { @@ -1543,8 +1659,9 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,1 vis bText2,0 + vis hSlider2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",12 + spstr strCommand.txt,tTmp.txt,",",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1555,8 +1672,9 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,1 vis bText2,0 + vis hSlider2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",12 + spstr strCommand.txt,tTmp.txt,",",14 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1568,10 +1686,11 @@ Timer tmSerial vis btOnOff2,0 vis bText2,1 tsw bText2,0 + vis hSlider2,0 bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",12 + spstr strCommand.txt,bText2.txt,",",14 } if(type2.txt=="button") { @@ -1581,17 +1700,41 @@ Timer tmSerial vis btOnOff2,0 vis bText2,1 tsw bText2,1 + vis hSlider2,0 bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",12 + spstr strCommand.txt,bText2.txt,",",14 + } + if(type2.txt=="number") + { + vis bUp2,0 + vis bStop2,0 + vis bDown2,0 + vis btOnOff2,0 + vis bText2,0 + tsw bText2,0 + vis hSlider2,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText2.txt,",",14 + //first value is current value + spstr bText2.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider2.val=sys0 + //second value is min value + spstr bText2.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider2.minval=sys0 + //third value is max value + spstr bText2.txt,tTmp.txt,"|",3 + covx tTmp.txt,sys0,0,0 + hSlider2.maxval=sys0 } - // id3 // get Type - spstr strCommand.txt,type3.txt,",",13 + spstr strCommand.txt,type3.txt,",",15 // get internal name - spstr strCommand.txt,entn3.txt,",",14 - if(type3.txt=="delete") + spstr strCommand.txt,entn3.txt,",",16 + if(type3.txt=="delete"||type3.txt=="") { vis bUp3,0 vis bStop3,0 @@ -1600,19 +1743,20 @@ Timer tmSerial vis tEntity3,0 vis tIcon3,0 vis bText3,0 + vis hSlider3,0 }else { - //change icon - spstr strCommand.txt,tTmp.txt,",",15 + // change icon + spstr strCommand.txt,tTmp.txt,",",17 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 vis tIcon3,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",16 + spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",17 + spstr strCommand.txt,tEntity3.txt,",",19 vis tEntity3,1 } if(type3.txt=="shutter") @@ -1622,16 +1766,18 @@ Timer tmSerial vis bDown3,1 vis btOnOff3,0 vis bText3,0 + vis hSlider3,0 } if(type3.txt=="light") { vis bUp3,0 vis bStop3,0 vis bDown3,0 - vis bText3,0 vis btOnOff3,1 + vis bText3,0 + vis hSlider3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",18 + spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1640,10 +1786,11 @@ Timer tmSerial vis bUp3,0 vis bStop3,0 vis bDown3,0 - vis bText3,0 vis btOnOff3,1 + vis bText3,0 + vis hSlider3,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",18 + spstr strCommand.txt,tTmp.txt,",",20 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1655,10 +1802,11 @@ Timer tmSerial vis btOnOff3,0 vis bText3,1 tsw bText3,0 + vis hSlider3,0 bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",18 + spstr strCommand.txt,bText3.txt,",",20 } if(type3.txt=="button") { @@ -1668,17 +1816,41 @@ Timer tmSerial vis btOnOff3,0 vis bText3,1 tsw bText3,1 + vis hSlider3,0 bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",18 + spstr strCommand.txt,bText3.txt,",",20 + } + if(type3.txt=="number") + { + vis bUp3,0 + vis bStop3,0 + vis bDown3,0 + vis btOnOff3,0 + vis bText3,0 + tsw bText3,0 + vis hSlider3,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText3.txt,",",20 + //first value is current value + spstr bText3.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider3.val=sys0 + //second value is min value + spstr bText3.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider3.minval=sys0 + //third value is max value + spstr bText3.txt,tTmp.txt,"|",3 + covx tTmp.txt,sys0,0,0 + hSlider3.maxval=sys0 } - // id4 // get Type - spstr strCommand.txt,type4.txt,",",19 + spstr strCommand.txt,type4.txt,",",21 // get internal name - spstr strCommand.txt,entn4.txt,",",20 - if(type4.txt=="delete") + spstr strCommand.txt,entn4.txt,",",22 + if(type4.txt=="delete"||type4.txt=="") { vis bUp4,0 vis bStop4,0 @@ -1687,19 +1859,20 @@ Timer tmSerial vis tEntity4,0 vis tIcon4,0 vis bText4,0 + vis hSlider4,0 }else { - //change icon - spstr strCommand.txt,tTmp.txt,",",21 + // change icon + spstr strCommand.txt,tTmp.txt,",",23 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 vis tIcon4,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",22 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",23 + spstr strCommand.txt,tEntity4.txt,",",25 vis tEntity4,1 } if(type4.txt=="shutter") @@ -1709,16 +1882,18 @@ Timer tmSerial vis bDown4,1 vis btOnOff4,0 vis bText4,0 + vis hSlider4,0 } if(type4.txt=="light") { vis bUp4,0 vis bStop4,0 vis bDown4,0 - vis bText4,0 vis btOnOff4,1 + vis bText4,0 + vis hSlider4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",24 + spstr strCommand.txt,tTmp.txt,",",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1727,10 +1902,11 @@ Timer tmSerial vis bUp4,0 vis bStop4,0 vis bDown4,0 - vis bText4,0 vis btOnOff4,1 + vis bText4,0 + vis hSlider4,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",24 + spstr strCommand.txt,tTmp.txt,",",26 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1742,10 +1918,11 @@ Timer tmSerial vis btOnOff4,0 vis bText4,1 tsw bText4,0 + vis hSlider4,0 bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",24 + spstr strCommand.txt,bText4.txt,",",26 } if(type4.txt=="button") { @@ -1755,17 +1932,41 @@ Timer tmSerial vis btOnOff4,0 vis bText4,1 tsw bText4,1 + vis hSlider4,0 bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",24 + spstr strCommand.txt,bText4.txt,",",26 + } + if(type4.txt=="number") + { + vis bUp4,0 + vis bStop4,0 + vis bDown4,0 + vis btOnOff4,0 + vis bText4,0 + tsw bText4,0 + vis hSlider4,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText4.txt,",",26 + //first value is current value + spstr bText4.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider4.val=sys0 + //second value is min value + spstr bText4.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider4.minval=sys0 + //third value is max value + spstr bText4.txt,tTmp.txt,"|",3 + covx tTmp.txt,sys0,0,0 + hSlider4.maxval=sys0 } - // id5 // get Type - spstr strCommand.txt,type5.txt,",",25 + spstr strCommand.txt,type5.txt,",",27 // get internal name - spstr strCommand.txt,entn5.txt,",",26 - if(type5.txt=="delete") + spstr strCommand.txt,entn5.txt,",",28 + if(type5.txt=="delete"||type5.txt=="") { vis bUp5,0 vis bStop5,0 @@ -1774,19 +1975,20 @@ Timer tmSerial vis tEntity5,0 vis tIcon5,0 vis bText5,0 + vis hSlider5,0 }else { - //change icon - spstr strCommand.txt,tTmp.txt,",",27 + // change icon + spstr strCommand.txt,tTmp.txt,",",29 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 vis tIcon5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",28 + spstr strCommand.txt,tTmp.txt,",",30 covx tTmp.txt,sys0,0,0 tIcon5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",29 + spstr strCommand.txt,tEntity5.txt,",",31 vis tEntity5,1 } if(type5.txt=="shutter") @@ -1796,16 +1998,18 @@ Timer tmSerial vis bDown5,1 vis btOnOff5,0 vis bText5,0 + vis hSlider5,0 } if(type5.txt=="light") { vis bUp5,0 vis bStop5,0 vis bDown5,0 - vis bText5,0 vis btOnOff5,1 + vis bText5,0 + vis hSlider5,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",30 + spstr strCommand.txt,tTmp.txt,",",32 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -1814,10 +2018,11 @@ Timer tmSerial vis bUp5,0 vis bStop5,0 vis bDown5,0 - vis bText5,0 vis btOnOff5,1 + vis bText5,0 + vis hSlider5,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",30 + spstr strCommand.txt,tTmp.txt,",",32 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -1829,10 +2034,11 @@ Timer tmSerial vis btOnOff5,0 vis bText5,1 tsw bText5,0 + vis hSlider5,0 bText5.pco=65535 bText5.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",30 + spstr strCommand.txt,bText5.txt,",",32 } if(type5.txt=="button") { @@ -1842,17 +2048,41 @@ Timer tmSerial vis btOnOff5,0 vis bText5,1 tsw bText5,1 + vis hSlider5,0 bText5.pco=1374 bText5.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",30 + spstr strCommand.txt,bText5.txt,",",32 + } + if(type5.txt=="number") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,0 + vis bText5,0 + tsw bText5,0 + vis hSlider5,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText5.txt,",",32 + //first value is current value + spstr bText5.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider5.val=sys0 + //second value is min value + spstr bText5.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider5.minval=sys0 + //third value is max value + spstr bText5.txt,tTmp.txt,"|",3 + covx tTmp.txt,sys0,0,0 + hSlider5.maxval=sys0 } - // id6 // get Type - spstr strCommand.txt,type6.txt,",",31 + spstr strCommand.txt,type6.txt,",",33 // get internal name - spstr strCommand.txt,entn6.txt,",",32 - if(type6.txt=="delete") + spstr strCommand.txt,entn6.txt,",",34 + if(type6.txt=="delete"||type6.txt=="") { vis bUp6,0 vis bStop6,0 @@ -1861,19 +2091,20 @@ Timer tmSerial vis tEntity6,0 vis tIcon6,0 vis bText6,0 + vis hSlider6,0 }else { - //change icon - spstr strCommand.txt,tTmp.txt,",",33 + // change icon + spstr strCommand.txt,tTmp.txt,",",35 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 vis tIcon6,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",34 + spstr strCommand.txt,tTmp.txt,",",36 covx tTmp.txt,sys0,0,0 tIcon6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,",",35 + spstr strCommand.txt,tEntity6.txt,",",37 vis tEntity6,1 } if(type6.txt=="shutter") @@ -1883,16 +2114,18 @@ Timer tmSerial vis bDown6,1 vis btOnOff6,0 vis bText6,0 + vis hSlider6,0 } if(type6.txt=="light") { vis bUp6,0 vis bStop6,0 vis bDown6,0 - vis bText6,0 vis btOnOff6,1 + vis bText6,0 + vis hSlider6,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",36 + spstr strCommand.txt,tTmp.txt,",",38 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -1901,10 +2134,11 @@ Timer tmSerial vis bUp6,0 vis bStop6,0 vis bDown6,0 - vis bText6,0 vis btOnOff6,1 + vis bText6,0 + vis hSlider6,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",36 + spstr strCommand.txt,tTmp.txt,",",38 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -1916,10 +2150,11 @@ Timer tmSerial vis btOnOff6,0 vis bText6,1 tsw bText6,0 + vis hSlider6,0 bText6.pco=65535 bText6.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",36 + spstr strCommand.txt,bText6.txt,",",38 } if(type6.txt=="button") { @@ -1929,10 +2164,35 @@ Timer tmSerial vis btOnOff6,0 vis bText6,1 tsw bText6,1 + vis hSlider6,0 bText6.pco=1374 bText6.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",36 + spstr strCommand.txt,bText6.txt,",",38 + } + if(type6.txt=="number") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,0 + tsw bText6,0 + vis hSlider6,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText6.txt,",",38 + //first value is current value + spstr bText6.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider6.val=sys0 + //second value is min value + spstr bText6.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider6.minval=sys0 + //third value is max value + spstr bText6.txt,tTmp.txt,"|",3 + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 } } if(tInstruction.txt=="pageType") @@ -1947,11 +2207,36 @@ Timer tmSerial //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } if(tId.txt=="cardThermo") { page cardThermo @@ -1960,18 +2245,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 97cb2068..75602849 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -612,17 +612,14 @@ Timer tmSerial ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,",",0 - if(tInstruction.txt=="entityUpdHeading") - { - spstr strCommand.txt,tHeading.txt,",",1 - } if(tInstruction.txt=="entityUpd") { - // command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 + // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 + spstr strCommand.txt,tHeading.txt,",",1 // get Type - spstr strCommand.txt,type1.txt,",",1 + spstr strCommand.txt,type1.txt,",",3 // get internal name - spstr strCommand.txt,entn1.txt,",",2 + spstr strCommand.txt,entn1.txt,",",4 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -630,22 +627,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",3 + spstr strCommand.txt,tTmp.txt,",",5 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",4 + spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",5 + spstr strCommand.txt,tEntity1.txt,",",7 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,",",7 + spstr strCommand.txt,type2.txt,",",9 // get internal name - spstr strCommand.txt,entn2.txt,",",8 + spstr strCommand.txt,entn2.txt,",",10 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -653,22 +650,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",9 + spstr strCommand.txt,tTmp.txt,",",11 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",10 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",11 + spstr strCommand.txt,tEntity2.txt,",",13 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,",",13 + spstr strCommand.txt,type3.txt,",",15 // get internal name - spstr strCommand.txt,entn3.txt,",",14 + spstr strCommand.txt,entn3.txt,",",16 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -676,22 +673,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",15 + spstr strCommand.txt,tTmp.txt,",",17 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",16 + spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",17 + spstr strCommand.txt,tEntity3.txt,",",19 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,",",19 + spstr strCommand.txt,type4.txt,",",21 // get internal name - spstr strCommand.txt,entn4.txt,",",20 + spstr strCommand.txt,entn4.txt,",",22 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -699,22 +696,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",21 + spstr strCommand.txt,tTmp.txt,",",23 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",22 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",23 + spstr strCommand.txt,tEntity4.txt,",",25 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,",",25 + spstr strCommand.txt,type5.txt,",",27 // get internal name - spstr strCommand.txt,entn5.txt,",",26 + spstr strCommand.txt,entn5.txt,",",28 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -722,22 +719,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",27 + spstr strCommand.txt,tTmp.txt,",",29 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",28 + spstr strCommand.txt,tTmp.txt,",",30 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",29 + spstr strCommand.txt,tEntity5.txt,",",31 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,",",31 + spstr strCommand.txt,type6.txt,",",33 // get internal name - spstr strCommand.txt,entn6.txt,",",32 + spstr strCommand.txt,entn6.txt,",",34 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -745,16 +742,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",33 + spstr strCommand.txt,tTmp.txt,",",35 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 vis bEntity6,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",34 + spstr strCommand.txt,tTmp.txt,",",36 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,",",35 + spstr strCommand.txt,tEntity6.txt,",",37 vis tEntity6,1 } } @@ -770,11 +767,36 @@ Timer tmSerial //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } if(tId.txt=="cardThermo") { page cardThermo @@ -783,18 +805,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm