From d5fa4311a22f2be1479ce6a8816bbafe9b6f2fa2 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 23 Jan 2018 15:58:09 -0700 Subject: [PATCH] Added eControlMethod.Cresnet to enum --- Pepperdash Core/Pepperdash Core.suo | Bin 83968 -> 81920 bytes .../Pepperdash Core/Comm/eControlMethods.cs | 2 +- .../Pepperdash Core/DeviceConfig.cs | 59 ------------------ .../Pepperdash Core/PepperDash_Core.csproj | 1 - .../PepperDash_Core.projectinfo | Bin 967 -> 1014 bytes .../Properties/AssemblyInfo.cs | 2 +- 6 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 Pepperdash Core/Pepperdash Core/DeviceConfig.cs diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 99a8f142354b28b18949aa6d443ce17550732535..13825704127f14846a82deefd04aec1cf9999bdd 100644 GIT binary patch delta 2011 zcma)7drXs86u;-|*HWMqD5W4mEs7{bplDSLz=i7rv#+w306hR-Z6^R>*FJ)CpubW?N=r!yPfxgQ;W_{ZXHem&>>?z#7# z-gC~a*QfS+)!mhXIFm7k)xwpi!QjxSCSnkCRTU7#ZK^-?mdBd=(!Q@jMSNcqHi$Fu zq&pXFqKHq#Y9X4TYeqJDwIXg+yTk;(ov(U4_C?XWx>DrZ;_dI#Vz`pb_a>`6>+*0+G)==8^wh65cH@~K9)nd`7X|r@LaqTy(TZ5#pB6E=uB831+AdR8wttMb}KmjiKR-WJc;wMGBM9T!lOAx7xiAG z+%RGggq93^T9$?#Bgf)Nb*?-xQZHb=*@XU4S9>co0Fm-~%RPW^@u#sz(N?0t&Z0Cm zV^I|B=OvF1y2hxm=H?$ z37-%?CE(o&2a10uLf5_$DWmBb1iD1G` z%RW4^)PSuy9`w~!qGh24uR0d)3S-PQShKttznENx*$WLgd$d+wT5?O!QZCro z;SI{?DCr(3Z$*Eafl|e1w#yk)G)!rb+e)d$Gf&jiFe2;+oc!4=s6N1_3pVjANudq^@t!K65*`%CoXC*9;+K7KoWLcz5W>Xc- z&Ze_+LKe#>u9WmF2{OSRdM{2%UMrMieg7U=Kc`oaHkqi6YP{kx`ce2+&3tu$ln><} zYJLurdQ9M;yX#sE*ms&rWQkMVW&|(RPw~pG72Sg5(}DvXYyD`bZBQZ43c zIB}K94V!j~C=_*I=R0<(Lj`)d`wf={V`|f}?@+q`zKE_CZ&$O3{>@9U|A|Ge-tmEe z&2Q^axBFDrPEop)25Y3lk)R9o>%gFrjzmKQzUp)P%gnNQ&vigylp)ZX2K~_G7oqb;i>Lw~5JH3oN*;5qQ87~$-o<9~iBR$B3oBWSp zXlPj!MrWkp+S4XAZ_cy0J*5$^e`Ap?XU4~ikwhthc)q(~+3Pk&9Uy|gC>OV delta 1925 zcmZ8hYfMyE5WaKw-enh;Wm%SoqU(x+xFRl(5=s&70)irim0H_Gv?8GOg=jY_)ar#+ zf3&oPo$AF$km9e_R)O2P^kH2eeZ<5nE|szcce>a zB!v$WQ>-LhX0Jj9=fa&>A1T+ zg#EYgyD90`l!q^ck=xD60{fcsXpjR8Gjsag`$47;8up=%3 z3+|?=_v6BNtg)_De0dNLpgu0rgUE6lM6jJi+va2(v1)s5w*h_m4^H@IYp{E%gz}L@ zeI@7OD!F`aBQF1A6;7L*h_013tbb9!%SR0;f3Fi+cih7BjyF9?7Ja6jaa}n5Z zsL#?{T%gfIJejd68*i5qm(E5C8$w3FX1rfg#=KScG6RIZM*JR+_;)C~mV?Gwi-j>J z&|s5pq33xYdaUNDWJ2pz&c+pR+qfNEExlM^;r3lo%6U7u*;~`P#8q?IxPAD2)mYxk zBOI1I74rD6<*kYp;^$Q2GwQDuzlTVXB*qhx$!qdRr4W}%nDZ3Rx;>M?0x|opRggC^ z<^{xUAjAdtCiquKZzUu=#Xm!O700Q0l}<6Fh%2J3(($Zu9yVG`=sYap4r>KAJNM#1 zwXDkP=q1fNTGW>HZVh_Il9Y~_V8%_ghp^RFr`Bz{!1vY_@;Vk|9$~!b^)9?5IB>MS zTo2S+ewGf~(K3MtwQ>6a0efHnfJVTI*B%*hWUC2VGdi&Ic!tuU0i!y!)1~d&E8vB) zQqMgB zLb3JTdaR#m_O{FcD|C5yT=&iv9NKTfPuf-}oe8khJCX&8%E;z(_<6^+-MSNFA5U zg>mGM{-g!?wj~AYzBMa7(U42S;9up$8$a7r+jmJ(0*k?_qq={&X-ic|YbP8g93dPh z93!wH?Vv9`9oI?tkkCa~)3baR^o|uq>R1!7A1ph|>yCgH9@C=Buro$b?%KhMBUL6A zD!8z%IMeI0fCShxBT~tWg@3$a4CKzz2ilv389yis%0bVqC%rbvDWlIqzaDBxUGs#> xhJH3y-qGj4Ab6#Da8^*O+KWJ6Lw-BCja;>2i-Bt8;sVHmK6Pz-F|Zp!&HvTPfcgLc diff --git a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs index da9b8e7..122578d 100644 --- a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs +++ b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs @@ -8,6 +8,6 @@ namespace PepperDash.Core { public enum eControlMethod { - None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet + None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet, Cresnet } } \ No newline at end of file diff --git a/Pepperdash Core/Pepperdash Core/DeviceConfig.cs b/Pepperdash Core/Pepperdash Core/DeviceConfig.cs deleted file mode 100644 index 4815533..0000000 --- a/Pepperdash Core/Pepperdash Core/DeviceConfig.cs +++ /dev/null @@ -1,59 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using System.Linq; -//using System.Text; -//using Crestron.SimplSharp; -//using Newtonsoft.Json; -//using Newtonsoft.Json.Linq; - -//namespace PepperDash.Core -//{ -// public class DeviceConfig -// { -// [JsonProperty("key")] -// public string Key { get; set; } - -// [JsonProperty("name")] -// public string Name { get; set; } - -// [JsonProperty("group")] -// public string Group { get; set; } - -// [JsonProperty("type")] -// public string Type { get; set; } - -// [JsonProperty("properties")] -// [JsonConverter(typeof(DevicePropertiesConverter))] -// public JToken Properties { get; set; } -// } - -// /// -// /// -// /// -// public class DevicePropertiesConverter : JsonConverter -// { - -// public override bool CanConvert(Type objectType) -// { -// return objectType == typeof(JToken); -// } - -// public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) -// { -// return JToken.ReadFrom(reader); -// } - -// public override bool CanWrite -// { -// get -// { -// return false; -// } -// } - -// public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) -// { -// throw new NotImplementedException("SOD OFF HOSER"); -// } -// } -//} \ No newline at end of file diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj index 431bbcb..ffa77ab 100644 --- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj +++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj @@ -79,7 +79,6 @@ - diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo index 14412c07eed4ba4f4834ddf969e1307afe46db20..bf301034f29c4da337da95013b9c1414c154bcd3 100644 GIT binary patch delta 813 zcmV+|1JeA*2lfY$g@5wVqqbhtFH`#JWxiVF_0z1G|NbXcom0bE^wSIabZ=+(V0&kG zd+*+x-TRMrA3WOI9e?^@_x{d%jiLzwhfG_x~QF8}q@8K1c^Xm=sI@Jw|UlEq_2=7k_qyFYD^3sn@gRdG)L) z^JTWkf0oheVzd$r3c`ReJ8P)F_S(?>^>x$cix+}bpVWl?MV&3qW^b~KXoHh#v7%wk zzFgjNQp^iKBw}osqtnGCpS`Zu^)x@Or}N@6x07~Kt*+lx&#H2k*Ud+d4DasITTk=J z`r>$bee&|FkAEJ0@1ybfuKi!$H2JbE2*ll2d6{QTp1#bcZ?lX1qwoKc(MMkt%VM!! zJS*zORaWOeNuY}gWZNC@>^z|V?>->-U#{ELx_z0oKfByZJ$;cai}So`-T3a&r*T$L zl6{dC%VQelVp3ka*Y@cfZ#uiL&dQP+1j8NQ8}B{Xzkd&UcBs-N$F~U#eRh!D&-Nbd z987jU-MhEDv$wZ*fAa9*WU~M1Wcpxle?l!~CI?YhipIZuUQM&|XPxE)+$i*Uny>QZ zEMHEkFJdf1+xsDHUl)s2`Fft!tCMxpR*U1dt&7RJ&6~4jo7d;r)WB21J)G`O_GkOk z`@0V(pH<$!pPfG>!hV|1rrF-?(@!T4eZt)yxV&=vE{2K!==Pod5GScWAKxE+^eS(7 z*!<@&8JQXSbZCaYotFf7U|zC(_Fylc?Bu%-@85rz-8;YkDcC!cr2;Gi_h>nIV_TtnZ1{+MnEr8!@8iu?3f9ZTY z9GZ{UKkH6d>^;2yAkWFdPVYT< rF!g8S16`d68o%WGzvP#&vsRoJ(+u2C<5`!j4DbH|^($No#SH)eXYhL^VKS^pJvVc_dluXoLbJJpI*?Xdpo-iws-focOSml zdHCr5y+=DcLPD`-{04P z{e6Gm*FWz6Jw`X?gBg904ty{vmi~K;-gsL6fVwX1z+TqXPk&RdXUp^ISyAT8Y?1#g zqt(S|B^VTh0bzF5P=D>U#qafX)8>m8f>xi_g#JaHEzV|dvWsYglWMV|am~J5-f~vV z3qK@kY?!3e#U!7-uGaN5Kdz_q;xe~XIjL6HZ>nciIm_$jqeq5&_dfb1qmRBQmc?Sd zcvjSltE|p{l7Cth6-K{1-r0FT|KEK;z`tC#t9AP_YkzjRkb3$eTNdYe(>gTo(Wmhl z)scUZ70ctM$rqFI+P$_<-*~gqeRWor)F2q{cyGM>;K9Mek9t(;lH=P1hCZ9zJJ^|i zdT;OE!^yqf$?o3%WdGCqyASWr?mal)eYl@dOPP>C)PI$t@h_iO)2#eir}+R=34NaC zt9&`jms9HNqetH}w7nnF_I0sXm9OVny*gPpZM8UV+q#&n+q^kjwt0P?O$|IH+`}o6 zYPLTmVog51e?L2aNQC_~pG~v9*{7dQ9{Pm4J#cyD_FW7U|IzI`{UJ_Le?GoH`sh{O z@UZ#MUnDXzGxX`u41GH<3Gl$YWclpDUOw5$iHYw&%{X9wAXgL||6$%FfQyAST~>`o_>2LsbF2sN0E zTfn~6Yz+4H|E|gCd|;!OouRpTnzh+@mPfU2HV*c7CZFz3_YbBA+1``}da(EK{)0Rx w3p>5{;K9_NjSqBnB53@Q@Bflt!p>T8UQ9D^KaFQywlci`2d}^vE{+WV05U$Vj{pDw diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs index bb7ad45..010930c 100644 --- a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs +++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Pepperdash_Core")] [assembly: AssemblyCopyright("Copyright © PepperDash 2016")] -[assembly: AssemblyVersion("1.0.2.*")] +[assembly: AssemblyVersion("1.0.3.*")]