From e8ba4e6b052793075977de4537becf67caf2105c Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 23 Jul 2022 16:02:11 +0200 Subject: [PATCH] sync --- .../portrait/diff-eu-version-known-good.txt | 38 ++++++------------ HMI/US/portrait/nspanel_US_P.HMI | Bin 11491767 -> 11491767 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 7761776 -> 7763400 bytes 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt index 1fad445b..4f080140 100644 --- a/HMI/US/portrait/diff-eu-version-known-good.txt +++ b/HMI/US/portrait/diff-eu-version-known-good.txt @@ -384,33 +384,19 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + tsw bDown5,1 + } + } -+ if(type5.txt=="light") ++ if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan") + { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,1 -+ vis bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,"~",32 -+ covx tTmp.txt,sys0,0,0 -+ btOnOff5.val=sys0 -+ } -+ if(type5.txt=="switch") -+ { -+ vis bUp5,0 -+ vis bStop5,0 -+ vis bDown5,0 -+ vis btOnOff5,1 -+ vis bText5,0 -+ vis hSlider5,0 -+ vis nNum5,0 -+ // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,"~",32 -+ covx tTmp.txt,sys0,0,0 -+ btOnOff5.val=sys0 ++ vis bUp5,0 ++ vis bStop5,0 ++ vis bDown5,0 ++ vis btOnOff5,1 ++ vis bText5,0 ++ vis hSlider5,0 ++ vis nNum5,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff5.val=sys0 + } + if(type5.txt=="text") + { diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 40906a45da5a0b2ab5c525f41160bd65308e9478..c9fbe7dbcb67e8b37cf8f94e918a9670d69e5936 100644 GIT binary patch delta 1959 zcmd7S?{5=j00;2r>9$fvYATz;n#!&#%*t3@*Rly(1ms7@Hs^i_Qgv(D7_HD*pt2#= z7C1LRwlQmWZfr0{9Tf*mM|MP9(k=5>eBm2)CTb!I8seK}8WZ37EqC1$&Hex{`J~@_ z?w;@6b5BxnbUaN2+VTOdrdeK>r^#e5FCp^r;YtmOD{vC_(qFIJf6M;Mc<@f zRHWwSe>{EMsBSZ=DJUQXQXvhLqEWrzyV?K$8}b_dett2Z!DsRh@DK7!_@#W-b?tPA z^6Of)!x0sN4nvVRFq7@3!TvVs!|hU2(v>3RKQxq_kn@pDN^EJ;_>C+|Zl_AQZy6iT9*H^v25SKa_=Te6xiCt(YKl9 zb6Z#**vj&to#ki=%R}1|IVcsyO4)_WWt7~NhDo@bl8F3r#!5;$l5F|Qh1_#1CJkP;n6aRbJ^03cmOnZ`$$j$V&zo8PHo)@jqb$$1vP@1> z(k{Pfdne1osI`|}nCPcOFYoKm=dl7g(?Kd!9?G!^b?bGRV(8E8sbeW? zEJfmln6^wMrr$NJ($G?2V%_qk!pt3=O8BXhQz`-hVWNx6&;$bh!@k{SlfT7pv*k3p zgm{FDh%FM|*E z!vQ!5es~2AK{K?#VR#jeKmcBY*C7ZYI10z$IPmZWv_c!4fRk_v-h|W84js@5XP^t- zf-t-d5$Fa1-hm!S?EP8jgMK&%=V1UYz#v?ND7*_pa0z1Y9$bd^VHmE!Rncs@)|&ed D-J%Yq delta 4957 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 diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 525a8a709c0345d22a97f780397638a334ed2c9a..7007d8940d2883253aacd1a67d09d2b057d7f766 100644 GIT binary patch delta 13307 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 delta 10930 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 MX_w8iQzP5`A8(Mj