From 4409644cf7189cd15dc8262bdb63bf544141505e Mon Sep 17 00:00:00 2001 From: Heath Volmer Date: Tue, 6 Feb 2018 12:40:50 -0700 Subject: [PATCH] Added hybrid ipid/tcp eControlType for HD-MD things --- Pepperdash Core/Pepperdash Core.suo | Bin 81920 -> 81920 bytes Pepperdash Core/Pepperdash Core.suo.orig | Bin 0 -> 81920 bytes .../Pepperdash Core/Comm/eControlMethods.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs.orig | 11 +++++++++++ 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Pepperdash Core/Pepperdash Core.suo.orig create mode 100644 Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 6d735710e727695c532ceb0398eaea0b870e7daf..0de33ea74f5633cf41da584cd95e442197d96e19 100644 GIT binary patch delta 2013 zcma)7eNa?Y6u)Qpy>%B6mt}<&S6DXULufSvR6tqKnaD9)Htk!7lFAB=l*$O1#X*}f z#&Cb>(`=G(#<5aEo=TF+8b)a)ROZ+>k(F6vo5LSvliRtlT7PzDe(&Djx#xbIk9%Gq zpaueJyU$=r6hd5yL?T7F+wknTLT1w$e#Q(&2_p_a8(vUac!YXmIId;P1>2hKpOTRU zVg>4ylVk^#Pe#D3=&RKA=1hYi5+aMIvl(v2M{nfWe!FrpBIUA~7-@QTT(SW@%8jVC z_EW6f!z35wD5#6SMNX(zrg``?ey)YgJRHqH%e*Yq+WO6W=ZNi^Ai-x|#KaI4jGoAY z<&yD=#<)`5YtK_nR@|_filC(bR03CP({WHy!g~l~^qdnaT#nTnMtiY3=i@;qM zD3KNSVR2>(0=`Sev3!w;{tIQ`iR>>sT1|wSYz5xhF3QBWIpc%5p+$$-I~@$2v7d2( zagfo;c#9#!)W!YV(eV-Pk21QW{22G|FnXf=UG94s?@7M#{_o-So<;vt8K}(;A@Gr% zCZqf58_G??;S%SE13FG5se27ELPR2?IF2X29(JMpm}fTF|LsRydu@^jy;@BUtYqmezeYW>Y=iUW3@LYQL@D& zmWY+2UepKu0c9VXt~dE}%~of{2M2gRwkr}5te_1{B5%jNM8)|cPZWr0{9P>-#Q$}H z)CGBx(2%veZIRmMHQ?yXWHRE&?w{DezbEvm(o4IrFC!ba70r6{L$yW>x@%BVWygXC zccXQ3G5dnE;87=V`b(7wd2&ShpoY5B)& zxgCRDo6$P0jC`DGJJ9--3xS1ZbtdZ!@~NA!_?h!KytV*=)e4;f?e9VRDm&Wi6+KXQ z7x9_ZZ4Cv zPJ!F=G9OS#m(b`tfuZL;jtzmTV#0C?RBNc#DnP4%dgt zRDfGwI)TcqVcowajw~TDTNH}>ginubn-eoqV|Mz?kMNot#&DVq?TjV7<8FgDJyDf~ zDvV>joNB#O=_d5;stCURzQT_-s{DHFSackIALn0lpmNeWv~SBmO{Q7j-&Ji09!<8K zrmDQmTmho&Jn--@Nkzu97=fY`JtcI`h~uB#p$=C;ignQdUm8X*z9I^KBybz@#;@&e-(#^QYy&r!#fEym8L477d>eocwdT%&2KR_vs< z%~tBMP$jD^VMsS=Lsq)YA|7PwxGJiRr)Id1mv;t=xmqd}EDzp0Knb!CYUk|a?Bv?% zB(8^cej6vXQ;A&NZB6#zg)ylD1(2>&iMY zklv)VIw?`!EB4?-@)$K=Dzyjarf?R1tfnDk%QGG3%`OUA$l23U=-p{n2_)6jSCy`IqrIChLQxpF4=SUdZbMArbc}i{~n-Dh8!~`fu=EIwnp|bg0&i6QJEs>1& zG5AU{lD3r=%$Lp`StD0fiE2@e($sD(Y@rnVQETrEXVTetWihLbgk=VuRvx~_3aJmX M<8SO7Dxz5BAK!(Sga7~l delta 1714 zcmah}YfMyE5I%GF-enip1=baCU0|WeJ3!GA1%*XTwARX_XlX$T^;ttHg-z4qqr6NL zMcwX)z0z7^F(FE;C|5({1J+^?tpQYuR*gkttCBP&icMMz^jx6*+5VV&XXebznKSdv zR8&Y671HqxL7&7J8yy=Pn}Iik&C`usn#(DR(>zY8oRaZa*dwYo*rFLSdKct1Z7jP^ z8h&IiLb-UEjG(1)sL+YZhtdw6Knzx+RbR>tc5>1vkw%N4CmvwTz-2g>N5J9Tiwk?= zwGmtqE}-1!Wj*OQ?>T88d2_~!KYW& z{DMkjnqoK4k+i;C+W(4DK4X-G*ckk|I8-?>vqqq0$gIgk_q`U_ulu`#MY@B^gbvuQ zSZIkt!NEkGNITRF_nkJvk`n5}2;$!!so*pf>m7bZ}M92ZRz zLj3&kU8oruTar)`RobvxLPDs8G#HuLLjuly^H2)m!4C7D)T3mR8FgEW;61y5qEWf2 z8K%-&rFOkTgO;)!(qZIe2dwWtz`?gfNkx&C*W#+0vm|oK0D5+VOXh}R9jdBN!~Mt? zyw-c$*!>y)>aQ;@m@3B zvl_Wel0KFeu_TtqRw`rLNyL+&#n`>^0tRYB=m{z_F5%$LSO~kW;lA@P^zHI)*)0m_ zJd%VJWoPMCr0w;?&~IJHn{7sSovFbkCiHCexcW;pg!7#o8J$rr`xki%9I)!7I~p@|>flDJRpHaD3^y7`AIsLLePy$` zWBtG55sBs_nOO0x3tgxET}@r03eO3rCW9ADakVJ87@^diDH7mxCg9-d2uaILegRo4 zaj4y_wus>;zaY2+^{#HS#uUR_@u(dG^=1st>2GlhqFfV3Yc)RHF7@^2lDZS_a(5Y_ zvu%p4bJ#=Aeb|zPuPrJ=aNijo$RPJbl1)4Rcd7Yku;SU1Vi2dO*Qk$i+&*iYs;;}; zT(gJM=%d>8HYON#MJ@qqh>d>?`YL~@pyN;xLXuEBmj zwZzws-{eF%X>ev;2eQy^>+M(A=9 zBwj|fGyfO=Ug!pSl@~SrXY3o)IucIb`-toQDai0V>J!y1F;TH3>QR?}>u@p|#J>Su C07z8; diff --git a/Pepperdash Core/Pepperdash Core.suo.orig b/Pepperdash Core/Pepperdash Core.suo.orig new file mode 100644 index 0000000000000000000000000000000000000000..6d735710e727695c532ceb0398eaea0b870e7daf GIT binary patch literal 81920 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 literal 0 HcmV?d00001 diff --git a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs index 122578d..d320366 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, Cresnet + None = 0, Com, IpId, IpidTcp, IR, Ssh, Tcpip, Telnet, Cresnet } } \ No newline at end of file diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs index 010930c..5be34b2 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.3.*")] +[assembly: AssemblyVersion("1.0.4.*")] diff --git a/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig new file mode 100644 index 0000000..4d15192 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs.orig @@ -0,0 +1,11 @@ +using System.Reflection; + +[assembly: AssemblyTitle("Pepperdash_Core")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Pepperdash_Core")] +[assembly: AssemblyCopyright("Copyright © PepperDash 2016")] +<<<<<<< HEAD +[assembly: AssemblyVersion("1.0.2.*")] +======= +[assembly: AssemblyVersion("1.0.3.*")] +>>>>>>> e16c2cbee87c631bf84ad9634bfbc25bbec78a31