diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6c8c8169..aebc8351 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-05-22 07:58:25.897799068 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 07:58:27.009807303 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:52:06.663941704 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 07:58:27.009807303 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:52:06.667941783 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 56a0ecb7..764d0cad 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2253,38 +2253,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2412,38 +2413,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2571,38 +2573,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -2730,38 +2733,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") 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 3589336f..c3223464 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 @@ -52,11 +52,11 @@ cardQR 205 Unique line(s) of event code cardEntities 65 Component(s) - 1117 Line(s) of event code - 487 Unique line(s) of event code + 1121 Line(s) of event code + 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4439 Line(s) of event code - 1163 Unique line(s) of event code + 4443 Line(s) of event code + 1167 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 90b30a61..bc4f5fff 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 0e5aa036..157f7426 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1281,38 +1281,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1440,38 +1441,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1599,38 +1601,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1758,38 +1761,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 111d0037..5fca3dc8 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 9933a497..a33bc8a0 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 2c8df16a..043e26e0 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2c79a36c..cb0ae92e 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-05-22 07:58:25.897799068 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +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-05-22 07:58:25.901799098 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -297,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1876,6 +2104,165 @@ +@@ -1880,6 +2108,166 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -342,38 +342,39 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + spstr strCommand.txt,tId.txt,"~",32 + // up button + spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt!="") -+ { -+ bUp5.pco=65535 -+ tsw bUp5,1 -+ }else if(tTmp.txt!="disable") ++ if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 ++ }else if(tTmp.txt!="") ++ { ++ bUp5.pco=65535 ++ bUp5.txt=tTmp.txt ++ tsw bUp5,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt!="") ++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 ++ }else if(tTmp.txt!="") + { + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 -+ }else if(tTmp.txt!="disable") -+ { -+ bStop5.pco=27501 -+ tsw bStop5,0 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 -+ if(tTmp.txt!="") ++ if(tTmp.txt=="disable") ++ { ++ bDown5.pco=27501 ++ tsw bDown5,0 ++ }else if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 -+ }else if(tTmp.txt!="disable") -+ { -+ bDown5.pco=27501 -+ tsw bDown5,0 + } + } + if(type5.txt=="light") @@ -464,13 +465,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +0000 -@@ -142,7 +142,7 @@ - Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none -- Text : please check your backend configuration + Text : pls check your backend configuration Max. Text Size : 100 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 73468337..aa09eec7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,34 +1,28 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 07:58:26.469803304 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 07:58:25.897799068 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 07:58:25.901799098 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:52:06.071870294 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 + Hotspot mSwipeNext + Scope : local -+@@ -1876,6 +2104,165 @@ ++@@ -1880,6 +2108,166 @@ ++ // up button -++ if(tTmp.txt!="") -++ }else if(tTmp.txt!="disable") -++ { -++ bUp5.pco=27501 -++ tsw bUp5,0 +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") +++ bUp5.txt=tTmp.txt ++ // stop button -++ if(tTmp.txt!="") -++ bStop5.pco=65535 -++ bStop5.txt=tTmp.txt -++ tsw bStop5,1 -++ }else if(tTmp.txt!="disable") +++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 +++ }else if(tTmp.txt!="") +++ { +++ bStop5.pco=65535 +++ bStop5.txt=tTmp.txt +++ tsw bStop5,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",2 -++ if(tTmp.txt!="") +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") ++ bDown5.txt=tTmp.txt -++ }else if(tTmp.txt!="disable") -++ { -++ bDown5.pco=27501 -++ tsw bDown5,0 -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 6b6d2214..b911f7cb 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2674,38 +2674,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2833,38 +2834,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2992,38 +2994,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -3151,38 +3154,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") @@ -3310,38 +3314,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",32 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else if(tTmp.txt!="") { bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt!="disable") - { - bStop5.pco=27501 - tsw bStop5,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt!="disable") - { - bDown5.pco=27501 - tsw bDown5,0 } } if(type5.txt=="light") 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 6cbeb6d1..16421cb3 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 @@ -18,6 +18,10 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code popupLight 27 Component(s) 345 Line(s) of event code @@ -48,15 +52,11 @@ screensaver 237 Unique line(s) of event code cardEntities 77 Component(s) - 1343 Line(s) of event code - 571 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code + 1348 Line(s) of event code + 576 Unique line(s) of event code Total 13 Page(s) 414 Component(s) - 4665 Line(s) of event code - 1234 Unique line(s) of event code + 4670 Line(s) of event code + 1239 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 f2086576..2cfd938c 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 0ebaec42..c25f8fdc 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1509,38 +1509,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1668,38 +1669,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1827,38 +1829,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1986,38 +1989,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") @@ -2145,38 +2149,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",32 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else if(tTmp.txt!="") { bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 - }else if(tTmp.txt!="disable") - { - bStop5.pco=27501 - tsw bStop5,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 - }else if(tTmp.txt!="disable") - { - bDown5.pco=27501 - tsw bDown5,0 } } if(type5.txt=="light") diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 111d0037..5fca3dc8 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 5ecd7707..90bfa81b 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 8762255f..e5dd5368 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index 35864780..8fcd077f 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -50,44 +50,48 @@ for i in range(1,6): vis nNum{i},0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",{idxstart+5} + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - {{ - bUp{i}.pco=65535 - tsw bUp{i},1 - }} - else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") {{ bUp{i}.pco=27501 tsw bUp{i},0 }} + else if(tTmp.txt!="") + {{ + bUp{i}.pco=65535 + bUp{i}.txt=tTmp.txt + tsw bUp{i},1 + }} + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + {{ + bStop{i}.pco=27501 + tsw bStop{i},0 + }} + else if(tTmp.txt!="") {{ bStop{i}.pco=65535 bStop{i}.txt=tTmp.txt tsw bStop{i},1 }} - else if(tTmp.txt!="disable") - {{ - bStop{i}.pco=27501 - tsw bStop{i},0 - }} + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + {{ + bDown{i}.pco=27501 + tsw bDown{i},0 + }} + else if(tTmp.txt!="") {{ bDown{i}.pco=65535 bDown{i}.txt=tTmp.txt tsw bDown{i},1 }} - else if(tTmp.txt!="disable") - {{ - bDown{i}.pco=27501 - tsw bDown{i},0 - }} }} if(type{i}.txt=="light") {{ diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt index 0d56cb46..42c39fd9 100644 --- a/HMI/code_gen/pages/out.txt +++ b/HMI/code_gen/pages/out.txt @@ -117,44 +117,48 @@ if(usize>1) vis nNum1,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",8 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - } - else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 } + else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 + } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + } + else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 } - else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 - } + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + } + else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 } - else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 - } } if(type1.txt=="light") { @@ -285,44 +289,48 @@ if(usize>1) vis nNum2,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",14 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - } - else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 } + else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 + } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + } + else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 } - else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 - } + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + } + else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 } - else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 - } } if(type2.txt=="light") { @@ -453,44 +461,48 @@ if(usize>1) vis nNum3,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",20 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - } - else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 } + else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 + } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + } + else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 } - else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 - } + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + } + else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 } - else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 - } } if(type3.txt=="light") { @@ -621,44 +633,48 @@ if(usize>1) vis nNum4,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",26 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - } - else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 } + else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 + } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + } + else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 } - else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 - } + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + } + else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 } - else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 - } } if(type4.txt=="light") { @@ -789,44 +805,48 @@ if(usize>1) vis nNum5,0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",32 + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp5.pco=65535 - tsw bUp5,1 - } - else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp5.pco=27501 tsw bUp5,0 } + else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 + } + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + } + else if(tTmp.txt!="") { bStop5.pco=65535 bStop5.txt=tTmp.txt tsw bStop5,1 } - else if(tTmp.txt!="disable") - { - bStop5.pco=27501 - tsw bStop5,0 - } + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + } + else if(tTmp.txt!="") { bDown5.pco=65535 bDown5.txt=tTmp.txt tsw bDown5,1 } - else if(tTmp.txt!="disable") - { - bDown5.pco=27501 - tsw bDown5,0 - } } if(type5.txt=="light") { diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 636a3e22..9ca0e570 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2253,38 +2253,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -2412,38 +2413,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -2571,38 +2573,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -2730,38 +2733,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index b7a67eef..254fe31b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,6 +22,10 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code screensaver 35 Component(s) 296 Line(s) of event code @@ -34,10 +38,6 @@ cardQR 30 Component(s) 363 Line(s) of event code 205 Unique line(s) of event code -popupShutter - 20 Component(s) - 241 Line(s) of event code - 138 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -52,11 +52,11 @@ cardThermo 290 Unique line(s) of event code cardEntities 65 Component(s) - 1117 Line(s) of event code - 487 Unique line(s) of event code + 1121 Line(s) of event code + 491 Unique line(s) of event code Total 13 Page(s) 402 Component(s) - 4440 Line(s) of event code - 1164 Unique line(s) of event code + 4444 Line(s) of event code + 1168 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 81bc0fd6..baddcd3a 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -647,39 +647,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0e5aa036..157f7426 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1281,38 +1281,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",8 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp1.pco=65535 - tsw bUp1,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp1.pco=27501 tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") { bStop1.pco=65535 bStop1.txt=tTmp.txt tsw bStop1,1 - }else if(tTmp.txt!="disable") - { - bStop1.pco=27501 - tsw bStop1,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") { bDown1.pco=65535 bDown1.txt=tTmp.txt tsw bDown1,1 - }else if(tTmp.txt!="disable") - { - bDown1.pco=27501 - tsw bDown1,0 } } if(type1.txt=="light") @@ -1440,38 +1441,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",14 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp2.pco=65535 - tsw bUp2,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp2.pco=27501 tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") { bStop2.pco=65535 bStop2.txt=tTmp.txt tsw bStop2,1 - }else if(tTmp.txt!="disable") - { - bStop2.pco=27501 - tsw bStop2,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") { bDown2.pco=65535 bDown2.txt=tTmp.txt tsw bDown2,1 - }else if(tTmp.txt!="disable") - { - bDown2.pco=27501 - tsw bDown2,0 } } if(type2.txt=="light") @@ -1599,38 +1601,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",20 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp3.pco=65535 - tsw bUp3,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp3.pco=27501 tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") { bStop3.pco=65535 bStop3.txt=tTmp.txt tsw bStop3,1 - }else if(tTmp.txt!="disable") - { - bStop3.pco=27501 - tsw bStop3,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") { bDown3.pco=65535 bDown3.txt=tTmp.txt tsw bDown3,1 - }else if(tTmp.txt!="disable") - { - bDown3.pco=27501 - tsw bDown3,0 } } if(type3.txt=="light") @@ -1758,38 +1761,39 @@ Timer tmSerial spstr strCommand.txt,tId.txt,"~",26 // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - { - bUp4.pco=65535 - tsw bUp4,1 - }else if(tTmp.txt!="disable") + if(tTmp.txt=="disable") { bUp4.pco=27501 tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 } // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") { bStop4.pco=65535 bStop4.txt=tTmp.txt tsw bStop4,1 - }else if(tTmp.txt!="disable") - { - bStop4.pco=27501 - tsw bStop4,0 } // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") { bDown4.pco=65535 bDown4.txt=tTmp.txt tsw bDown4,1 - }else if(tTmp.txt!="disable") - { - bDown4.pco=27501 - tsw bDown4,0 } } if(type4.txt=="light") diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 111d0037..5fca3dc8 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -362,39 +362,39 @@ Timer tmSerial } // set icon bUp spstr strCommand.txt,tTmp.txt,"~",5 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") { bUp1.txt=tTmp.txt tsw bUp1,1 bUp1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bUp1,0 - bUp1.pco=27501 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",6 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") { bStop1.txt=tTmp.txt tsw bStop1,1 bStop1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bStop1,0 - bStop1.pco=27501 } // set icon bDown spstr strCommand.txt,tTmp.txt,"~",7 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") { bDown1.txt=tTmp.txt tsw bDown1,1 bDown1.pco=65535 - }else if(tTmp.txt!="disable") - { - tsw bDown1,0 - bDown1.pco=27501 } } if(tInstruction.txt=="dimmode") diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 41e0e70e..e1c3a28d 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a6c7a124..c18f3814 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index adb6ebd8..f1a09cc5 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -426,13 +426,15 @@ class LuiPagesGen(object): def generate_shutter_detail_page(self, entity): entity = self._ha_api.get_entity(entity) - icon = entity.iconOverride - icon_id = get_icon_id_ha("cover", state=entity.state, overwrite=icon) + icon_id = get_icon_id_ha("cover", state=entity.state) pos = entity.attributes.get("current_position") if pos is None: pos_status = entity.state pos = "disable" + else: + pos_status = pos + icon_up = get_icon_id("arrow-up") icon_stop = get_icon_id("stop")