diff --git a/PepperDashEssentials/PepperDashEssentials.suo b/PepperDashEssentials/PepperDashEssentials.suo index e3a0bb95..562298af 100644 Binary files a/PepperDashEssentials/PepperDashEssentials.suo and b/PepperDashEssentials/PepperDashEssentials.suo differ diff --git a/PepperDashEssentials/PepperDashEssentials/Config/DeviceFactory.cs b/PepperDashEssentials/PepperDashEssentials/Config/DeviceFactory.cs index 45ef0eac..c5cd8686 100644 --- a/PepperDashEssentials/PepperDashEssentials/Config/DeviceFactory.cs +++ b/PepperDashEssentials/PepperDashEssentials/Config/DeviceFactory.cs @@ -23,34 +23,38 @@ namespace PepperDash.Essentials var typeName = dc.Type.ToLower(); - if (dc.Group.ToLower() == "touchpanel") // typeName.StartsWith("tsw")) - { - var comm = CommFactory.GetControlPropertiesConfig(dc); + if (typeName == "amplifier") + { + return new Amplifier(dc.Key, dc.Name); + } + else if (dc.Group.ToLower() == "touchpanel") // typeName.StartsWith("tsw")) + { + var comm = CommFactory.GetControlPropertiesConfig(dc); - var props = JsonConvert.DeserializeObject( - properties.ToString()); - return new EssentialsTouchpanelController(key, name, typeName, props, comm.IpIdInt); - } - else if (typeName == "mockdisplay") - { - return new MockDisplay(key, name); - } + var props = JsonConvert.DeserializeObject( + properties.ToString()); + return new EssentialsTouchpanelController(key, name, typeName, props, comm.IpIdInt); + } + else if (typeName == "mockdisplay") + { + return new MockDisplay(key, name); + } - // MOVE into something else??? - else if (typeName == "basicirdisplay") - { - var ir = IRPortHelper.GetIrPort(properties); - if (ir != null) - return new BasicIrDisplay(key, name, ir.Port, ir.FileName); - } + // MOVE into something else??? + else if (typeName == "basicirdisplay") + { + var ir = IRPortHelper.GetIrPort(properties); + if (ir != null) + return new BasicIrDisplay(key, name, ir.Port, ir.FileName); + } - else if (typeName == "commmock") - { - var comm = CommFactory.CreateCommForDevice(dc); - var props = JsonConvert.DeserializeObject( - properties.ToString()); - return new ConsoleCommMockDevice(key, name, props, comm); - } + else if (typeName == "commmock") + { + var comm = CommFactory.CreateCommForDevice(dc); + var props = JsonConvert.DeserializeObject( + properties.ToString()); + return new ConsoleCommMockDevice(key, name, props, comm); + } return null; } diff --git a/PepperDashEssentials/PepperDashEssentials/Devices/Amplifier.cs b/PepperDashEssentials/PepperDashEssentials/Devices/Amplifier.cs new file mode 100644 index 00000000..bed85856 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/Devices/Amplifier.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; + +using PepperDash.Core; +using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Routing; + +namespace PepperDash.Essentials +{ + public class Amplifier : Device, IRoutingSinkNoSwitching + { + public RoutingInputPort AudioIn { get; private set; } + + public Amplifier(string key, string name) + : base(key, name) + { + AudioIn = new RoutingInputPort(RoutingPortNames.AnyAudioIn, eRoutingSignalType.Audio, + eRoutingPortConnectionType.None, null, this); + InputPorts = new RoutingPortCollection { AudioIn }; + } + + #region IRoutingInputs Members + + public RoutingPortCollection InputPorts { get; private set; } + + #endregion + } +} \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj index 8d255acf..6a2afa9b 100644 --- a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj @@ -134,6 +134,7 @@ + diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo index 2ca7bdab..bfbfa4fa 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ diff --git a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs index 33f751cd..db2f759d 100644 --- a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs +++ b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs @@ -42,7 +42,16 @@ namespace PepperDash.Essentials displaysDict.Add(i++, disp); } - var presRoom = new EssentialsPresentationRoom(Key, Name, displaysDict, null, props); + // Need to assign the volume control point and also audio routing endpoint, if routing + // is required: For DSP, typically no. + IRoutingSinkNoSwitching masterAudioDev = null; + if (props.Volumes.ContainsKey("master")) + { + var audioKey = props.Volumes["master"]; + + } + + var presRoom = new EssentialsPresentationRoom(Key, Name, displaysDict, masterAudioDev, props); return presRoom; } return null; @@ -70,6 +79,12 @@ namespace PepperDash.Essentials public List DisplayKeys { get; set; } public string SourceListKey { get; set; } public Dictionary Volumes { get; set; } + + public EssentialsPresentationRoomPropertiesConfig() + { + DisplayKeys = new List(); + Volumes = new Dictionary(); + } } public class EssentialsVolumeLevelConfig diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-06 08-53-09).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-06 08-53-09).log new file mode 100644 index 00000000..229191b5 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-06 08-53-09).log @@ -0,0 +1,22 @@ +3/6/2017 8:53:09 AM, Info: Initializing SIMPLSharp Services... +3/6/2017 8:53:09 AM, Info: ProjectInfo successfully initialized. +3/6/2017 1:19:35 PM, Info: Saving project information... +3/6/2017 1:19:35 PM, Info: Saving project information... +3/6/2017 1:19:35 PM, Info: Saving project information... +3/6/2017 1:24:35 PM, Info: Saving project information... +3/6/2017 1:24:35 PM, Info: Saving project information... +3/6/2017 1:24:35 PM, Info: Saving project information... +3/6/2017 1:29:35 PM, Info: Saving project information... +3/6/2017 1:29:35 PM, Info: Saving project information... +3/6/2017 1:29:35 PM, Info: Saving project information... +3/6/2017 1:31:45 PM, Info: Saving project information... +3/6/2017 1:31:45 PM, Info: Saving project information... +3/6/2017 1:31:45 PM, Info: Saving project information... +3/6/2017 1:31:45 PM, Info: Saving project information... +3/6/2017 1:31:45 PM, Info: Saving project information... +3/6/2017 1:31:45 PM, Info: Saving project information... +3/6/2017 1:31:48 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +3/6/2017 1:31:50 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +3/6/2017 1:31:50 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +3/6/2017 1:31:52 PM, Info: Saving project information... +3/6/2017 5:18:28 PM, Info: Terminating SIMPLSharp Services diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-07 13-43-38).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-07 13-43-38).log new file mode 100644 index 00000000..b7438bde --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-07 13-43-38).log @@ -0,0 +1,3 @@ +3/7/2017 1:43:38 PM, Info: Initializing SIMPLSharp Services... +3/7/2017 1:43:39 PM, Info: ProjectInfo successfully initialized. +3/7/2017 2:00:35 PM, Info: Terminating SIMPLSharp Services diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-13 10-44-29).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-13 10-44-29).log new file mode 100644 index 00000000..e5f5ff90 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-03-13 10-44-29).log @@ -0,0 +1,3 @@ +3/13/2017 10:44:29 AM, Info: Initializing SIMPLSharp Services... +3/13/2017 10:44:29 AM, Info: ProjectInfo successfully initialized. +3/13/2017 2:48:56 PM, Info: Terminating SIMPLSharp Services diff --git a/PepperDashEssentials/PepperDashEssentials/bin/Essentials Devices Common.dll b/PepperDashEssentials/PepperDashEssentials/bin/Essentials Devices Common.dll index 4e6134bf..fdf2ac2b 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/Essentials Devices Common.dll and b/PepperDashEssentials/PepperDashEssentials/bin/Essentials Devices Common.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz index e7af7b06..69e351c3 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll index a2400cf4..87be3067 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb index 86b6d9c8..3675d2be 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll b/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll index f2a767f5..7aafbd4b 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_Core.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_DM.dll b/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_DM.dll index ec3c3325..f73302b2 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_DM.dll and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDash_Essentials_DM.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config index 381046c6..a0fd0d11 100644 --- a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config +++ b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config @@ -10,8 +10,8 @@ - 3/3/2017 2:10:14 PM - 1.0.0.25506 + 3/13/2017 10:50:47 AM + 1.0.0.17722 Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info index 26f70ff8..f366057a 100644 --- a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info +++ b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDashEssentials.dll:5511f262a85934403988d20b8adf9a11 +MainAssembly=PepperDashEssentials.dll:ac3af5e6028ddf61e481b2335937c5c9 MainAssemblyMinFirmwareVersion=1.009.0029 MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c ü @@ -30,9 +30,9 @@ DependencySource=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e DependencyPath=PepperDashEssentials.cpz:Crestron.SimplSharpPro.UI.dll DependencyMainAssembly=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e ü -DependencySource=Essentials Devices Common.dll:8aa9519dd8b47681a03ce49bbd85d7ca +DependencySource=Essentials Devices Common.dll:22c2d648cf02d3bf28b6c42f461c927f DependencyPath=PepperDashEssentials.cpz:Essentials Devices Common.dll -DependencyMainAssembly=Essentials Devices Common.dll:8aa9519dd8b47681a03ce49bbd85d7ca +DependencyMainAssembly=Essentials Devices Common.dll:22c2d648cf02d3bf28b6c42f461c927f ü DependencySource=EssentialsHttpServer.dll:0666085bdb0856c1d117699c7859bb8c DependencyPath=PepperDashEssentials.cpz:EssentialsHttpServer.dll @@ -46,17 +46,17 @@ DependencySource=PepperDash_Core.dll:598033e01568965c3bd67b29e5993374 DependencyPath=PepperDashEssentials.cpz:PepperDash_Core.dll DependencyMainAssembly=PepperDash_Core.dll:598033e01568965c3bd67b29e5993374 ü -DependencySource=PepperDash_Essentials_Core.dll:fa7be9399267fd4cec1ae0929edbd944 +DependencySource=PepperDash_Essentials_Core.dll:a3ae2c4b5d2e1890a5788cf717d1b579 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Core.dll -DependencyMainAssembly=PepperDash_Essentials_Core.dll:fa7be9399267fd4cec1ae0929edbd944 +DependencyMainAssembly=PepperDash_Essentials_Core.dll:a3ae2c4b5d2e1890a5788cf717d1b579 ü DependencySource=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Displays.dll DependencyMainAssembly=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0 ü -DependencySource=PepperDash_Essentials_DM.dll:e1019b74d6e14079ed0473b76177aae3 +DependencySource=PepperDash_Essentials_DM.dll:6ac51b82e3f70b4b9b30032ccbb9cdc8 DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_DM.dll -DependencyMainAssembly=PepperDash_Essentials_DM.dll:e1019b74d6e14079ed0473b76177aae3 +DependencyMainAssembly=PepperDash_Essentials_DM.dll:6ac51b82e3f70b4b9b30032ccbb9cdc8 ü DependencySource=SimplSharpCryptographyInterface.dll:dd4791a86d6f67ddc309c4ab1e24c663 DependencyPath=PepperDashEssentials.cpz:SimplSharpCryptographyInterface.dll diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser index 819ef1b7..b685a887 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser and b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser differ diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll index f0296bbe..b260766d 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll differ diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb index 00ee1978..6de4d42d 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb differ diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache b/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache index e67711d5..f8105fb8 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/ResolveAssemblyReference.cache differ