diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 46fde01..e35e72a 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/ControlPropertiesConfig.cs b/Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs new file mode 100644 index 0000000..1759deb --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/Comm/ControlPropertiesConfig.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; +using Newtonsoft.Json; + +namespace PepperDash.Core +{ + /// + /// + /// + public class ControlPropertiesConfig + { + public eControlMethod Method { get; set; } + + public string ControlPortDevKey { get; set; } + + [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value + public uint ControlPortNumber { get; set; } + + public TcpSshPropertiesConfig TcpSshProperties { get; set; } + + public string IrFile { get; set; } + + //public ComPortConfig ComParams { get; set; } + + //[JsonConverter(typeof(ComSpecJsonConverter))] + //public ComPort.ComPortSpec ComParams { get; set; } + + public string IpId { get; set; } + + [JsonIgnore] + public uint IpIdInt { get { return Convert.ToUInt32(IpId, 16); } } + + public char EndOfLineChar { get; set; } + + /// + /// Defaults to Environment.NewLine; + /// + public string EndOfLineString { get; set; } + + public string DeviceReadyResponsePattern { get; set; } + + public ControlPropertiesConfig() + { + EndOfLineString = CrestronEnvironment.NewLine; + } + } +} \ No newline at end of file diff --git a/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs new file mode 100644 index 0000000..da9b8e7 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; + +namespace PepperDash.Core +{ + public enum eControlMethod + { + None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet + } +} \ 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 af07934..6d36aa5 100644 --- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj +++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj @@ -63,6 +63,8 @@ + + diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo index b1caf0b..ffb5024 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/SIMPLSharpLogs/(2017-02-13 13-07-49).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 13-07-49).log new file mode 100644 index 0000000..05c7af7 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 13-07-49).log @@ -0,0 +1,11 @@ +2/13/2017 1:07:49 PM, Info: Initializing SIMPLSharp Services... +2/13/2017 1:07:49 PM, Info: ProjectInfo successfully initialized. +2/13/2017 1:50:03 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +2/13/2017 1:50:03 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +2/13/2017 1:50:04 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +2/13/2017 1:50:04 PM, Info: Saving project information... +2/13/2017 2:06:06 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +2/13/2017 2:06:06 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +2/13/2017 2:06:07 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +2/13/2017 2:06:07 PM, Info: Saving project information... +2/13/2017 2:12:55 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 16-41-29).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 16-41-29).log new file mode 100644 index 0000000..595e740 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-13 16-41-29).log @@ -0,0 +1,3 @@ +2/13/2017 4:41:29 PM, Info: Initializing SIMPLSharp Services... +2/13/2017 4:41:29 PM, Info: ProjectInfo successfully initialized. +2/13/2017 5:29:14 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-15 16-07-21).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-15 16-07-21).log new file mode 100644 index 0000000..43dc649 --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-02-15 16-07-21).log @@ -0,0 +1,29 @@ +2/15/2017 4:07:21 PM, Info: Initializing SIMPLSharp Services... +2/15/2017 4:07:21 PM, Info: ProjectInfo successfully initialized. +2/15/2017 4:07:49 PM, Info: Saving project information... +2/15/2017 4:07:49 PM, Info: Saving project information... +2/15/2017 4:07:49 PM, Info: Saving project information... +2/15/2017 4:07:49 PM, Info: Saving project information... +2/15/2017 4:07:51 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +2/15/2017 4:07:51 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +2/15/2017 4:07:52 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +2/15/2017 4:07:52 PM, Info: Saving project information... +2/15/2017 4:08:11 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +2/15/2017 4:08:11 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +2/15/2017 4:08:11 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +2/15/2017 4:08:11 PM, Info: Saving project information... +2/15/2017 4:08:45 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +2/15/2017 4:08:45 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +2/15/2017 4:08:45 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +2/15/2017 4:08:46 PM, Info: Saving project information... +2/15/2017 4:12:17 PM, Info: Saving project information... +2/15/2017 4:12:17 PM, Info: Saving project information... +2/15/2017 4:15:10 PM, Info: Saving project information... +2/15/2017 4:15:10 PM, Info: Saving project information... +2/15/2017 4:15:10 PM, Info: Saving project information... +2/15/2017 4:15:10 PM, Info: Saving project information... +2/15/2017 4:15:11 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +2/15/2017 4:15:11 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +2/15/2017 4:15:11 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +2/15/2017 4:15:12 PM, Info: Saving project information... +2/15/2017 4:16:08 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz index 419274b..11e8158 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config index 64b0e20..22ac27f 100644 --- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config +++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config @@ -10,8 +10,8 @@ - 2/13/2017 2:06:06 PM - 1.0.6253.24901 + 2/15/2017 4:30:35 PM + 1.0.6255.29716 Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll index 882fe71..c212aa3 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb index 0879618..59f87c4 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb differ diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info index b318c1c..c33361d 100644 --- a/Pepperdash Core/Pepperdash Core/bin/manifest.info +++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDash_Core.dll:376f0c0b11f57cee97fbee77c6d5579f +MainAssembly=PepperDash_Core.dll:15c0159d41d05e8dc532bb46356b033d MainAssemblyMinFirmwareVersion=1.007.0017 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e ü diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser index d1bb685..6981938 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll index 066f88b..eb5ba5e 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb index a9afd6a..fce23e2 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb differ