From 2b29bf6aa5e703153fa8222800c08a638684a4be Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 22 Aug 2017 10:28:00 -0600 Subject: [PATCH] Minor updates to Fusion Occ before merge --- .../PepperDash_Essentials_Core.projectinfo | Bin 1337 -> 1336 bytes .../Essentials_DM/Essentials_DM.projectinfo | Bin 1133 -> 1136 bytes .../Essentials Devices Common.projectinfo | Bin 1154 -> 1155 bytes .../Fusion/FusionSystemController.cs | 4 +--- .../PepperDashEssentials.projectinfo | Bin 1958 -> 1937 bytes 5 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index bc99d309182e9c774a7029f9047817fab46bb389..105e6eabfaadd9ec5827f72e1f77864ff1ccff65 100644 GIT binary patch delta 1163 zcmV;61a$kk3b+c8y?^h`?#`pV2ak65#`ks~9Nc?&u)Xu?qn#aUH>Y+dkAC0Z_q$d7 zwpd=IPm4OAwpCr^&F}mBy8eFO-}m*8|GvL(Zae*be_w|{3IzPd?yDzRL*Gn_rT=vo z_wjU9{(w*^ELC3C)lU-^XUp^ISyAT8Y?1#E(A(HY?hqT4p84BA=a9ixtsl_T}=Hvu$4ZAyW00 zlYhFHkib=9U{ys@3(I>RDCJ^1AuxkrAZ5kABJMqc4hOu~;vj74_mO ztMi|v7DOY6*?)Lv=OO)n?;!#Ia^0@h?aQqF+2?lZ?Tc(#oaasJP`yW=-pC(@5?^G+ z@|eC_Ov-BqVxPY8W^DtQSy@usfD-iI-rmD|P(2-jbt(02f(Y7vx^r)5nmyc`?M$b8 zd47IBdzhc^%|6|~pHCQ(_Nfu~uP?@#vk?mx`3 z^G|ml?%aQPzLVwm_V*v$o1D)A0>1}zdFS?h+-_zby$1$A-oa#dcAJ?pAcN_-1>g^y z9@Fjri|6FQt>)yko#*v3Z^?Wu*2`j=!4Nj#Jl*>=|Mb&)`wt)NKD@uXzmw;mp6^cf z^U3u7z4QBd_TU!tw6U9D?rzc9ht1taRQ_K)pMM9pn$Krz*rss)_NMuS%u6=ApJh7_ z56&MPO!p_BP9J`HFC)WqejAM#fDPvB7QjDjzJjj*Upzk#Z#6%!@)>veYiKB-Mhb&Pd~jkeYo>rlHX#2Lb$;U-2(cD%~06)|BI(+cjs1f^wn87 zJ%2j~2(l zLb5x?d68eWWD%?Lj${3By7O>)e|B$YmVf25+3ft_;r;2oPqXRdJe%e_v->{nH$V#} z;1)1%IRP7b{D1Q-+#8yOSNVB~yhyb?Tef)(dW6%F-#b4)$Y+yDcCbI4&K~UEzdw2S z@L)gx^uhkY!6dNiw*ec>%PoMv_q+^u{r~0(>SPDpa9;n!^Ka)R^)fI&=R4E;JAe0Q zvwS)`$S7Ad+n+qRzqk9~{?6`nGI=mCKZ8(%>A3~$_nw}?p8wxBJDm^gTy=5>ZfsAp zHXF~f*3Hhr-p=IH-Rb_p^dQ@t(qIqv9^QYD=QCpWdk-E=2MkG!hPNhmhn5lae#!TL d$uHpqQ*o|=35|1IwleJh2Yg~o;sodx006TekIn!9 delta 1164 zcmV;71atei3b_i9y?^)3?*5~_gGcxF#=8$5-2e3c-uBL?k9Kyb-JIH;Jo-zhBf8WyEx$X4#{e2w*DG=}*yRV*P4Sh2ymj2gW z+{e>Z`2#|wuvB?jS3gZyoGs6*XGNJWvqk(&bE2she*|1 zPX6g)lFwdO>w20W*VB1%nOkl+saDr-s%KR>%j@Q&M@EqLKKdo2kG?3D#bUj9R@95D ztj>RuS`dvOW`E$O z%VYX#F)6Pdh<*CTo3#yKW@Slj14__;dwUP>LG^S9)}_?92_k6w>CU~KY4&h$wlkgX z<@x#j>|uVsH~Vz|em1MtZGCs{$`Er&or_}XF zkG^MS<9;|BCpArXT`kA2i^ZyZJc$<<(=F2al4s$^d1=ekf*ReMc*HN^eS(d4*cgY z8JS7@^nZ4f_C+{TlNmAp^gKHtNw_ze96UJR+nwc;gNM7jdk2%<*==UZfDESR7Jxr+ zdQ7+fFP@VJx0;jFcAnSEye0FsSTBod21D3{^K|di{L@eG?LU05`|$qm{!X5MdcHf^ z&nMIS_s;L<*@Iim)5dOsxw}PYA2xRzQTc!Ie19I?YCfN>VVlDF+neSSGB4TeewOV# zJUD-FFx{VgI(_)*y^IXc`E4{}05+JfTLAyC`3k!JfARc0yw&`?$`@6ecLa-ll}Ym9_&2Wn~_G^ySJY|*v)rtGd&h$Ff+FR{9!X=yZwLjr0j;1 z;tkdF7LB%fc#r(9oll9EAI|O{Og_E;@ZluSKIPA{e8-=PIG|8@-3;!Q6ACVIH{n@>pS$~$#X0!8yhxe!VKFy|+^K6>$%spY}w{D=n+mwe((JJAfHVp*}?vFI(x8t|Ni9R z!-M_&(+B$p2a~|6-v(?jFSh{x-t#it_5YhEsFNLV!+HG^&%d3Q)XTv9obOEU?|qaDQ+2!Tp`x>16U?V15Rn2Ges3*zY|(gFXMhZ+1E#*tzQD4&2zD zW^Fc}Wv!c?gT0-}r@PbrgXuxGH>JTI>^;2yAkSyS?)M%%m<||{7!7Yt><%p>=>3xK e|B_$A38vy)0}~qOx@=|G{|_o%iUld?761U;7nRij diff --git a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo index 93d8d457cdf130b56c8bb9c0e1295c12a3f58189..23216726a21a8502949dfa3f84365b194d361030 100644 GIT binary patch delta 735 zcmV<50wDeE2=EAyvVXnV-FdY4;L+}b@$Q2M_YNNJZ|{8iXlIAo&8gkVqu=-U{ccsi zEtVJQ)1uC&ZB-X}^ZWk3FZ0zZub*bk{P+ERU;p^;`}^j$%is6+b={{=zwrP3{qg6d zSav=ePgms+sKdgJ@MT^7H1&11Jg=S=WxmW7`OgkAAs#E~wtt{*37xZsI%%&Bv0q;| zZN7LRsB|ez2w&9M;%xRNyBPj@k=HT>$Fo_{7S%Eh8E z@YB6dAI=_py0bT%+~5E7UViVvZ1?NJwy2WA>mJIn%BBoj$apxRrz|J)hiOf@zeaWnC7q7t5sFE3Q(yz&9Z!d zvcGr#lXwDNQ<&_|ZZkCoWH2AM0Q^DoVLJVP*Cad$C&3%qNmb_|>GvMqBZl4i^xn?? z!`c0V$*1=pKAhy)r~Fx#@A#yT0}2R!3vjn0c)Y9scaiyEkjx(3lP3d~e|h-uU_bx# z!T!O)B#?mHfDI<%7Qo+gB8EHuf7y)e4$a8xpLqW5yd*3JCggl)dVlBsY?e=F2ib#z zd$aw?gZq2C5AN^mPA8KG0~0a`HJFcEz<$s980`1|71PoAz)sHI(BwSL+H5?_S~ndB zdpna)cc=RY(}QepO5;1&F+&uP&xoP#J$Nv^*+P7f-ycEkmwf-1{1T34it}QcK@@0= R>#~(0|3986z39Ra0094jr4IlA delta 732 zcmV<20wewK2<-@vvVXqW-G8)q@aW!y@$UZay`6jaws$^#w6jC)=G5-w(eL~Fez&UM z7R!tDX;J6XwyKM~`F(%im-%Xy*H5!%{`>yEuYdga{e5%WpV@)L~&q__D5kn)*6ho>$L`GGAtk{AUN55Ra8~TYpfugw9z*owV16*srgf zHeb9DRJs%fnoPS)Auh>#(~=pX&5FxW9jN z=wD>T@|eC@Ov-BqV4uG6CSwrDtSqTzFmU>BZ-4LpgO7Uj=@RDK1dl#@xW6~qoqc*R z-FvwAV0U&uyLbOVp6yOPefaQTfA{`5wUnv3#b}huH%T>nUQM&|XKO~3(QcsG(|naL zXZdnUeSP%kdxr4$L&BfbG_Q5F9KS9WtMc_ct5+m|-QhAQ8CD)EJP#eB1)?2hE4+^#5Ix@F1K7Z)hh~ork2~dw7o+cIVT3JNpl3 z_YWqY-hcRTl4qatXIZ}ElRge8Aowl7-HPDxuKwRe=7Zaqf|Du(mVbdulYjbP|KMN} zNWg8t1`}}$;O{vR!yW&>Y({p6X5{rxJpXoH5*7m!a=tUYzjJ>!%crx0?7_jk+5Y6g z{k`1>_jh)ulgWdD2^oYM%*QQYzvp}m_WS>e>F9i5CueVHa-L>wHlAgzn~sCMoyn)W z)BS_#LAE!g@g3|vBr(rFpAkdfd+=a-vxWE|zdwT7FZup2`6V396z9b>gDB7#*JUe1 O{(k_YCtaJu5C8ztPoeby diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo index e0c0916957b227d4380bf4c80c8c56eece4a7d99..449478ddb0da8eaba69184d4222c0db0fd22a51a 100644 GIT binary patch delta 931 zcmV;U16=%q34;lc!hhbI-JM5!4<7CAk00(lxc}*c-R+%EAMNZ=yE(NxdG!1KzTd6t zx5e@zeOlD{w5{qQZ+_q3_hr6X<@M97ng71O@9Q7`eShEF_Wb+)zJpk9{AyBc`hGlJ zl|LY)3QL%mb@kJP&)M?4dRCPAGF#+7T!e>lT?uLhp++d5HGhOidu`_N^>x$cix-0K zrU|71Uewv*Z1yI*2$}|StF0D!Ewg((n-y(QEwd7okbNm=xLVa`;+~>`wz41{L|fs zJNF-+?_~MC{rv~`Cg-y~pV03CUEaBUAGeyKNAH2a&)r=1C+qv8k6z^sQ-uHgB_lI^ zpWbTvJ|xfD{3^R{!kK%px4)O~?e1mSy@UOGdwU1j{n^9aeDdk12YZv>0x*9*sV-7s zlRW#BKg;qRe}3YCg88@wxZBM~ys!Un(EnhN{;rSMRD8N~Z)ci4+?(x8r+ayRem{Gd zpYP2+-M^ntC-(v+cO%SjR&Iv;-m?<#_Wv6b^e~(tC-N`ytF~G;)p^JMJe=-4oZg?^ z+nHtgY&JVTczAz$@6&8LInRHl`OfUVKQ$Ym1(R|Mn75mh4ITb}V>)(shUVi{eqJKD zsFr8THm^aMaANX%=jR9cY%<9X_NUX?gWdc0Cl4PU?B}08*grU!1Tu3Qu)z%70{HvR z&~VTHADOD%p{aWP6VJb$mxSHGOr7sc@9*57k;^hGy+))@I{b*1CB**xRA_Wx9VbJ;?T^G;VUF z?mx)$8HvEX2M?zHJZ+}tZK>WNY6Q7o^8H`(OE^|5&WmXV>7h}s%T@;c{{X1ZVe?E9 F003@}5qSUr delta 930 zcmV;T16}-s34#fb!hi0Y-Tg;<2aoRUj}H#+@7;TFZ+qv{M>{*zZcgn^9{s+*?{};E zZLz#apB8mKZL7M-o8R~MeVMOTdHpnN=D+Xn`})U!-`_X4J^#MH?;w^NznT=Az8_Cl z0XUHvrSbGAIMo)u-j%oh0%7vW)CSAtqWs1eF%4SylhUYmJ*eciPA;)S5Q zX+mj$7j?Eco4v^{f~LXTYO6(F%j_P{W<^_6%d7-t~*!Sr}=R`ofnt6WsQ?+b^WG#R+Y27Za#Ws1Z(f3Uo!gWi(*+U){AFFy|~Ki z{3odeQ43->-hbJ7NdMn^NWi~bx2tvgGHZXRLO>mVku8h!ylEZQ_vq7`xW&-qi>z24 zQ=`SCymk=w=^Jk*hoQ{Ml9~o2q5t;w_wIlCQIB$6l6{-V03v^y9o(O0`v?2e+5P+X z_V+$LKbY-)da!qIx;wdda84~{(rz;zoq!wLJ+G!&`G3Qnts5Ct$oVv1<;z*VoDvcr zJ^G%Rl>6bNoYXYwHNEt@Sggv|^Q>NxWRC^n>-B0?)vW?lLQk_S-=EOjJj}B5Pj?^g z+<$n!ljZmJ_aEGwoX_@rLca%edFS?h+-iy*y$1q6cXQdFtnZILdX+a!5&rX+jLh_X zdaLRCJRxiItL(Z7XYK(>RKB;nmu2@3_V4ZO9c1@s4|ns)rz9nl;sP*#{=wwa`wt&Z z^6XRoEX#NN`H2Gx=HnLNZZ{wCzW%>K|ARsLyFOx5@#)UJooV)PZ?-d??&bOU{p?|W zzBl`H|9(E5+zXW4jWEMmxf$|%&q}=8|8Gpt!*GI}$iK+1+G^QU=N`>Db*FnvYlcd5Pen zTAnT2yar{$iOKJspC9D2$s{8mY&v_ed;k9A;lqRd{L=^f2M3ctW^MyEn4wz$f8QAz z?)m>CQ?)xZRj+^I`M2|uup5}E^PTDao%^#{KAjz84-W3l_9qW@?(gkBxWBVIolG7K z%+w&%V4`jT`+X;Bu;c$%&r|0EJ8OGGv-UJ=v+*oz-8>!a?My!1o$en@53;=}jhh^) z`w#MbMj~+U!GozkPn)TETdH@68bR)teE*mH5{}i1^J1DodT5mEvXw#qKe$F-7)%lX E08A?gTL1t6 diff --git a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs index 227f81f1..79bf3747 100644 --- a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs +++ b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs @@ -34,8 +34,6 @@ namespace PepperDash.Essentials.Fusion Dictionary SourceToFeedbackSigs = new Dictionary(); - FusionOccupancySensor OccSensor; - BooleanSigData OccupancyStatusSig; StatusMonitorCollection ErrorMessageRollUp; @@ -1072,7 +1070,7 @@ namespace PepperDash.Essentials.Fusion FusionRoom.AddAsset(eAssetType.OccupancySensor, tempAsset.Number, tempAsset.Name, tempAsset.Type, tempAsset.InstanceID); - ((FusionOccupancySensor)FusionRoom.UserConfigurableAssetDetails[tempAsset.Number].Asset).RoomOccupied.InputSig = OccupancyStatusSig; + ((FusionOccupancySensor)FusionRoom.UserConfigurableAssetDetails[tempAsset.Number].Asset).RoomOccupied.InputSig.BoolValue = OccupancyStatusSig.InputSig.BoolValue; //} } diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo index 9a443a5c8ca116dd069922f9dd880ba546828f91..9fea13f22eaad4c4d89267436b2cabf96b48eda6 100644 GIT binary patch delta 1750 zcmV;{1}XWb50MX$wtwE6-JM5!4<7C9jQ98U9v&Rf$Dcmh*`aoGYIpMJ_x*jpTh(ui zQ>G%D8U;p^;`}^j$zu))wb$$Eo{7)yvGXB+gy7~ciUD%Po ztgD}U&t^qiRLiWy*yXd6YOx|B%)VUSath50Kl`M+X+}>MlYI8NTG!M3 zxSr07%iK=!NwvCuQ$4H7Szb3EJu(uoM{hmNC+myj<@L$SuReP8z3=~$(MMkt%VM!! zJS*zORaWOeNq?^pksvVRot=mD|GkIw-k0lkwQgT#?avwyQzu_!%i=t5T8HvI`g8*? zC@H?kisdnVxR{jJ?%jR*#+#<-`?Ip7R>7F*zugBry9XcjNYkasw+R+~_UZlm_x5J9 z>0~$mG<&eKm+$X?I?WDt@88?K|M1>}8MTyY+B^uQ?SFp zH$3h}B!ApY(x{l9Mx9^7gUPTP52FY}g+&0@VQrWwqZ5kV#2y-)K`KfSmA@WJlG`@8!) zdH(77?qoloOz+=2zn^ChZZR(#y9ws%7M*>~xqsS-!~gr{@8DMR_iPPw63*A&G@pFB ze?Obu&$69|2j>qCru&mmrw>29m!0p;&TpgP0@m+$TFW!b%h{d;?R2ig7E!(Aferw4lv&kwR&%t!}tFekSF|25~N)9e5H zW`AXO=T_75DqmD>-kB9**iZAF$=O!8aIN(eWY zlv_amnv)WC`v1Z?*}c`Ae03I1$IijSd&I*#)5*?c|NgxPI}i3|r1F%fb`ILBdmfgGm@ZtXM z!Q|83gX#3s2lxC*xCvx13AX@z(%x;NGXxPxE`{=LZk-oxob$05O1J@Zr?=nB{|m|73Clga9n=`b zKi#>vGtD0E%_ub6%X5m;9_Hjnl82d3C-(wZ^+uQ>@o$Fw9>kA#`2WIr=tSP}A#?-p z^V#|SgNOGYw6bU&kX-`@U|!eW0S zZU;ED!8e1yX+Cb(>;DUqfrssy9|6e#ooe0~F<=c5l;0Goq%V!Vv^2tt4 z2_wq4QkLk`2RjFo{K2RD`}b$lS$tyRAj1IeX27?fj(C6n@0*0ZPCV^K@FKrzDPLBd zck<~Er=&#g&+hHah+wlBxqp)Pr}sY1rW1^FXLdhM{~olCB-{w|_N4E1_5VVucOvF6 z%FN&8j@;+>X1iH7%g(dC?9==pCu>TP?EQoLq}=ziN#LW#z=Q_+W?;9cv+Lvkg#_+I z!w&0L`FV*I;%YgdUpPFp`p|B_!a`sgR~x;WQ$Dw?Nt*~+y2Kl`yc2WKPz04`MUzyJUM delta 1796 zcmV+f2mAPu52g>0wtw!M-Tg;<2aoo5#`o^;?cdwm+ur%~(asLFn^U`!N5Ajy``xO3 zTP!cqr$wDl+o~?|=J)-5T~EL7@B8}4f8XCXxBdOTzpv}tZ|8qHDVFiC#?#dgsO!Rx z{AFGJH1&G6Jg=S=WxmW7`Oh9&QH)lCK|vT0W@ioc*It|Xcz=D}wE5zNU^PH}8p1`L zEzV|dvWpvAE%I7s>3B9P+M-%!CB`nFom7hz5n=Y_@|II*UijH3-Ayxkx|rm%*VVe7 z=EwDPUR>sOichN5^_%KhRnGFd`RI|6fIWKaX+BwB951g=UVin_qwjq*9^aM!y~@ix zYx4AEHhr62Z?ZSb4j$}gpPrvj_wVoSe1Dqn-<$4#x<7fiGo4UNnZV71 zP}**2@w}R5<h;IBI!roaF9&B23P&B19q&+BF0k{Md8m&G)L zK{Fz#Q+|=YNyw{d?#4^X$Pb=4E3y!Cc*`=Z#5@horTk}bMWvU@i4iuJCptU z_a5v#*qf2!-@CV;KiJK8ZZjPgWH1xA0Dt^7XTtXP|H4Vw3n#&WO2vn4QW(OX?f5i1 zxIfMI5B8_C`}gnd?|piHFxw?Pa&Njjxp#2xPr^+gL%VS^;F~7lrvCn4I0^T{NpL_< zsycs3E__zLzFtnlIe3^&?&VXWRZbzqgX!MR{eyd-PCw1>ou3~(%y$B7aRbC)3V&_^ z_ogYhp}YSV&cI-3{`+GD9p-;{kD|7nPf2AzoZUZ|e0u-k!%3cf%AaNVPMq*QppfNn z26uaU`@Q_Xkj$O1+{4>JjZys5oqIde?BU*wLbJU*r#S6lPJSeLnE7;aFK|_FgxS$I zH$r|7;>SDuf8jiIBJcPRx`Fq@{eL}*f&?Oci^J~SPTcJrhLiew)gptunqQwS+q^!{rX6vZ&GsKW+|3R?oqc-# z>4Vv9dT;09bU&Ny=6m~73XA=TxE4TkvN&eu|{r&s1=`21magbpEcQfGI zPe;7J|MyM8UMHS*BY2TtwSSZ^tIj+5^oLVYBKK$ac4kDd*^FGt`_p@$X447Axih;T zr+*JxM-py?d3)0Ly83@1)jJV$7-i<~a!2m-d$Zjvn`P(OUiN8zknev=OG5YVAKWM9 zzL!k`A2kLhpz|$&-JZ^_kN+1ExDyRKtY78lCDx9s<$!+S@F<^6CVv@)uG86r-TU_^ z@L%#zAM76-Oad46HeiDZxCQXrPrz`W|1X@7PGsyx@%ks8Z`AkaJJb6+#Gv_fc91