diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 99a8f14..1382570 100644 Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ 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 14412c0..bf30103 100644 Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ 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.*")]