From 589b21461cd4eb67a0b8f07c73104086937aaaa7 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 22 Mar 2017 16:29:26 -0600 Subject: [PATCH] Minor updates to address min/max level parsing issues when resubscribing --- .../PepperDash_Essentials_Core.projectinfo | Bin 1280 -> 1281 bytes .../Essentials_DM/Essentials_DM.projectinfo | Bin 1140 -> 1141 bytes .../DSP/BiampTesira/BiampTesiraForteDsp.cs | 28 +++++++++--------- .../BiampTesira/BiampTesiraForteDspLevel.cs | 4 +-- .../Essentials Devices Common.projectinfo | Bin 1163 -> 1158 bytes .../PepperDashEssentials.projectinfo | Bin 1872 -> 1874 bytes 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index 055fcd97b6fe75e0e8dedecd290f6db21389e3ac..8a6cc2b275bd6a873ef39289847a0de85e433b21 100644 GIT binary patch delta 1104 zcmV-W1h4ym3V{lcz<*C4?LK_8^KiWP>CVBuhx^+*pFY~zp>}g>ck<}>{e8b%)o+XC zMf$X;^J!bvMc(|rzpv}>_x*ie|M>6w`{uUO-}m=*2&6#3Z|uH$k~Q?rq*(f2cX1z2 zSLF`~mBLcxWnKL=VR5!RubvfUzRVW+4*|^$7_J1Nf)FA^&wm=~zP&b6_xieN^Ti86 za^n=yxGw5!aW;FCUEH$mBClmak7u)@EvjW!f-LgcNwruJeP&-SZ#moMg&!hSZ#ns= zi%C9vU9IbBeq2xI#bs`};iOt!zp0*8z|6{$+6I)M|MvEFAA%Gef^{kNZGwp2c6SbTcJH5`&+hL`r@OQL z?B0Vd`UkVwY=Bs=;%a>E?`lCnR zGqZ6&oQ;#3rn|0|-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$K7HqH6Qb1ZL-ZpXNK0y?Z5NMWd{or8z> zcK5QK>11cJfB)WtodHhpZ)xpbLIgGC*Wpqx14}@Xa8>| z`)){f$2c$YtCkdQb>8vY9!_^2PVdj|?aZ=#Hk+LvJiI@>_h~kroM+Q~XLjGG{RU{k z1l$7VEhk_@kN2&sB_x}CK z!-og^`KJ%|4-O`Q8+{wF!Mxl8_&Y=83L{@(6``#ZbS$>hPn{0u@3rso#0-+Ound;Wjl>~ub`bJa-{xJj`+ z&Dv}{%UU-(2YWk{Pj{#L2h)RWZ%Ttb*n4>YL7vZu-S0hk@WY7mBk28-@Bflt!ugBh WT>V}e=elfV*#8fRjl&y96#xKK3wK!n delta 1103 zcmV-V1hD&o3V;fbz<>LX?tl7dcW?ag-h)qf4<2sseEMi-huY1l-N~ch_xJs7RlhBk z7wOZY&Zliv7kTsh{=Tli-}m=@{o}vy@0;6Bf8XENA&>$Azp?x3N!HLelVa(A-Nk)8 zU6nr|R0>O#mv!~igvHtNyn0rY`7&GNKLj*4V7L;53POkwJ%4Mc`}W#Q-RtY7%@;2O z$&FJ)xXSAM zC#eO|2x2zg*?)OR|KEE^z`tC#t9AP_Yk&5+oqGEsTNdYe(>he|(Wf`^hoQt5S+P8( zuNIT?+JV@oZ@gLC0A^N})Ha|5{kONb`w*n)5Ufk7ZxclHw!3q%vwQ#ie0G0lI^CV^ zXT(U^y~({#@9%%QlTE3m%+;+%q=dh@;qz*ml|Phex__B3g^W-0Rlc0%%PDpJ(WCE~ z*|;Ch#z{@nU02KT>teAgU(d68MdCYtnqL;v{PlXZs_Iq&DuJh2mhVsY_wGN;vhz=O zAMV_Lc)pY6_xAT6+?$-w_Iv`r2XuMo_I=!LW*)r<20!E}>`&46M<2b)8>R#Q`AbG- z(muW2q8r2j_dcvwU*!aCdj_V6r>A%}g1P!Svh$@CQzh z>GuD{bMoL;b8_0w^Lm-LWWE;bWiicQ2%B)8?tPkn`suy>hYxli-rwEd$@5RocPIP# zWP1PJ`Tab5aEp1`*iA5Zx9IG{=58Y@|1X};gMVAi=c{~CwRvX(v-7=A^PS1wy`BBN zhxw-u_olOZ_jmH?r}w50cOFdgTTEaGH<+x5A3;X_m@f1D0)f9bo7S7Jj!NYsI zd)dx(vNPGgfA7K0gS{Cs{NBC&{K0O%bDP<*AcKjy1>g^x7~Adti|1r_C!7>-sGc)o zD1Wvy+nqd|9Xxn&@BYJs`{(=TlYD;E@T(7mAvdi@j6znz!V%fS4c?@aIS+@HFgkTaBy$7KY4I}Z}-9do!#kV@?cLd!>*hrpc zZ8n}|t(%>Ly`9OYyVL!H=|Q$PrNJKTJ-q)Q&u7H$_Z~d>VMO^6^nS_rf5|W5{6%rD VelLx4UA8jp{|9T|U`Q(b&)r}@9+CEU#;@`Y1Yht-{1H3kN>{EZ*IH%eScrqefsnZ|Ignae@=>J z=dRD0d%WRSV>>v~3v65~J>VKBdIcuns_Sz8p^>x$c zix+}Qm%@bbMV&3qW^b~K;jb5YEmLqjn-y(QEwd6sl+RA8#fru{`*L~9`7tm2>{4iW zx=t69eD=Cp*VFvCp3aNQ+|J)gwYq*&J*&!DUN;{-GHkr}(JvW&^hL2O7VE{cqF!8O zb^epof+ztdAAj%cJf#2cJtW{?uG`hReVMgCD_lq&e331S^So&tcK7I0on8m`_m2+! zi>z24(-(_LdF=q~(>LB^3<8;zCAAC&PXFyaxc}hOk9zd!66V_kk3P$@?B1u7^M?;- z(+AV(ewG~^%<{d54<77J@1IZhC)84=<`$z-D&N%Xd4Dy{%Ac(nQAWFgW>51~zMSRD zDfRWyqwg8Q-wz3YQq#QF)pGp0Sggv|^Q>Nx0FIyLm&G)HybNm&1sh9`;+~> z`wz41{L|fsJNF-+?_~MC{rv~`Cg-y~pPKIhUEaBUAGeu^NAJ=9&;E?{=j8jNk6z^s z51jw}C4VC`OP}6umdso$*(S5|``Pq7JJ^{{?@cBL56<^?XZhsd;qLCFoaf>E7i2 zKHH#}j`08m1iuBiTM<0o)&IN5d~h36(5LwR?tjj~&hGv5^Vxmk%H7$1cJINb*}ciV zPw(%4x|2ma`uKM=V{hv<49T7y6HIB+nId2JKaB+9%Oq{8sEX*!}|~N xd`1j?@4gAu|I003B6IXeIV delta 974 zcmV;<12O#d2=oY$w10d5(fv;!?H-Kx5B5KOcyNDv=hH_!JJfDY?M@#3zQ6BxtNLxR zyhxuGbv|vYy2zW~_xF97uU2{eG;8L+@9+Ei$A917H@98>zQ3>QK7IOy|L5*}Yeue0TO^{goKWwywFc9042SV^}9b$?6foHf)*du@pQ`nqZJ z#S1~DOJPFzqRtj)vp3nr@YjpHmMJ)%&5E|DmRX4*%4a9lVnt(}eYw2l{FoPhb}2MG zU8jplK6_oQ>uG*mPv^yDZs+f$T3x@Xo>k>6ubYn^88+Vg=$DK>`l47Ci}m7JQ7^8t zI{!&(L6iWKkAHV|9@78!9un{`*X?TEzRcR66)vO>zQ~rvdET@RyL5IjrymkQg=^Jk{27%1Vl3E4>r~mdoJvcb{s7IeJVZKf9(AR?pI}gwI4kr8e zAKZU1$-B0?)vW?lYEH8(-=FO7 z-G7*6=b!FA+`0eod?(BA?e9OhH#wi}`P6(5=$PFj3A-JR`c_a1zj-J9I| z^#1;*JJ~I?`VjGN0r`E2AMf@5UGwlToChbOFY>FlS~k^r#}Yi8?mV2{pWWM;W%+D2 zJ3n}Me|qoJY&tp5ruok7zCQySparzQ1w_l>}q+oZ1Wlf z2!H9H-#b4)$Y+yDcCbI4&K~UEzdw2S@L)gx^uhkY!6dN6w*ebW#4Uio=R^#5{Qt5U z*&UjZ*FW+6+j&V?3{1%R&h-Ay{n;#^&JMB%2lr void SendNextQueuedCommand() { - Debug.Console(2, this, "Attempting to send next queued command. CommandQueueInProgress: {0} Communication isConnected: {1}", CommandQueueInProgress, Communication.IsConnected); + //Debug.Console(2, this, "Attempting to send next queued command. CommandQueueInProgress: {0} Communication isConnected: {1}", CommandQueueInProgress, Communication.IsConnected); //if (CommandQueue.IsEmpty) // CommandQueueInProgress = false; Debug.Console(1, this, "CommandQueue has {0} Elements:\n", CommandQueue.Count); - foreach (object o in CommandQueue) - { - if (o is string) - Debug.Console(1, this, "{0}", o); - else if(o is QueuedCommand) - { - var item = (QueuedCommand)o; - Debug.Console(1, this, "{0}", item.Command); - } - } + //foreach (object o in CommandQueue) + //{ + // if (o is string) + // Debug.Console(1, this, "{0}", o); + // else if(o is QueuedCommand) + // { + // var item = (QueuedCommand)o; + // Debug.Console(1, this, "{0}", item.Command); + // } + //} - Debug.Console(1, this, "End of CommandQueue"); + //Debug.Console(1, this, "End of CommandQueue"); if (Communication.IsConnected && !CommandQueue.IsEmpty) { diff --git a/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDspLevel.cs b/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDspLevel.cs index 8ddbac0e..c9828e49 100644 --- a/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDspLevel.cs +++ b/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDspLevel.cs @@ -220,7 +220,7 @@ namespace PepperDash.Essentials.Devices.Common.DSP string value = match.Groups[1].Value; - //Debug.Console(1, this, "{0} is {1}", attributeCode, value); + Debug.Console(1, this, "Response: '{0}' Value: '{1}'", attributeCode, value); if (message.IndexOf("\"value\":") > -1) { @@ -238,7 +238,7 @@ namespace PepperDash.Essentials.Devices.Common.DSP { MaxLevel = Double.Parse(value); - Debug.Console(1, this, "MaxLevel is '{0}'", MinLevel); + Debug.Console(1, this, "MaxLevel is '{0}'", MaxLevel); break; } 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 15fe75a74ebfc061336c6f1429d67af61de3ab77..bdce5c5826b9b1cf6dcb5ff28ff9777acb3fca44 100644 GIT binary patch delta 745 zcmVTi@f=Lf8Uq+YL(Ydvu6JL{=Tn&{P+ERbKCRp`}+=Jx$&z>vFZEqbXER< zkSZ);Ue?u56Fz6l^Xgeq=F4o6|8Nl=#&spA6@(h0eAW;m?SHkI$Jf_Qn=f7nx|=4H z26$0ti?i9A>>_9y%&oRsw20W*VB1%nOoL4saDr-s%KR>%j@Q&M@F#rKKdo2kG?3D#bUj9R@95Dtj>Ru zS`f7$cH^C$hkx|{y@v$+%XPb2w=c8yhbjcr@fX>$IM18bVSSH2y@^{4O}@yAf?(WCc3;OA~G`;+zk(MPZHhAF~-{*sZIzE5v8 zeV=D-ewAG};mkeQ+uzIgcK5RE9%O7pEot@e4kp8ZZ$W-j_?i}pw-akK|-QSr`cW3+Ay$7FW_a^r~ zy}$qIPBtBwia5+*R&D|Ly=Nuf?f*9>=wUcPPUK(YS8cUys`HNhc{ts9IK4l+w=>J~ z*=%-x2|&jF-ly4=O#hRa1GqU5$B-j+|3RM5NCfUZco0~j&D6Xt)jLFuAookY|4V)e b$7;oSG0h-7G|F|^%Ao%r*fLy0OcDS9+6=5v delta 750 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 Z*Nbyq*`blG%T@;Z{{V>mO$dl1003C?NMHZ}