Merge remote-tracking branch 'origin/development' into feature/ecs-1116

# Conflicts:
#	PepperDashEssentials/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "essentials-framework/pepperdashcore-builds"]
+	path = essentials-framework/pepperdashcore-builds
+	url = https://ndorin@bitbucket.org/Pepperdash_Products/pepperdashcore-builds.git
+	branch = development

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -88,40 +88,62 @@ namespace PepperDash.Essentials.Bridges
                     }
                     else if(advancedTxDevice == null || basicTxDevice != null)
                     {
+                        Debug.Console(1, "Setting up actions and feedbacks on input card {0}", ioSlot);
                         dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]);
 
                         var inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--hdmiIn", ioSlot)];
                         if (inputPort != null)
                         {
+                            Debug.Console(1, "Port value for input card {0} is set", ioSlot);
                             var port = inputPort.Port;
 
                             if (port != null)
                             {
                                 if (port is HdmiInputWithCEC)
                                 {
+                                    Debug.Console(1, "Port is HdmiInputWithCec");
+
                                     var hdmiInPortWCec = port as HdmiInputWithCEC;
 
                                     if (hdmiInPortWCec.HdcpSupportedLevel != eHdcpSupportedLevel.Unknown)
                                     {
-                                        SetHdcpCapabilityAction(true, hdmiInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                        SetHdcpStateAction(true, hdmiInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
                                     }
 
                                     dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
 
-                                    trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    if(dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
                                 }
-                                else if (port is DMInputPortWithCec)
+                            }
+                        }
+                        else
+                        {
+                            inputPort = dmChassis.InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)];
+
+                            if(inputPort != null)
+                            {
+                                var port = inputPort.Port;
+
+                                if (port is DMInputPortWithCec)
                                 {
+                                    Debug.Console(1, "Port is DMInputPortWithCec");
+
                                     var dmInPortWCec = port as DMInputPortWithCec;
 
                                     if (dmInPortWCec != null)
                                     {
-                                        SetHdcpCapabilityAction(dmChassis.PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], dmInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
+                                        SetHdcpStateAction(dmChassis.PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], dmInPortWCec, joinMap.HdcpSupportState + ioSlot, trilist);
                                     }
 
                                     dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
 
-                                    trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    if (dmChassis.InputCardHdcpCapabilityTypes.ContainsKey(ioSlot))
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = (ushort)dmChassis.InputCardHdcpCapabilityTypes[ioSlot];
+                                    else
+                                        trilist.UShortInput[joinMap.HdcpSupportCapability + ioSlot].UShortValue = 1;
                                 }
                             }
                         }
@@ -138,7 +160,7 @@ namespace PepperDash.Essentials.Bridges
 
                         if (hdmiPort != null)
                         {
-                            SetHdcpCapabilityAction(true, hdmiPort, joinMap.HdcpSupportState + ioSlot, trilist);
+                            SetHdcpStateAction(true, hdmiPort, joinMap.HdcpSupportState + ioSlot, trilist);
                             dmChassis.InputCardHdcpCapabilityFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.HdcpSupportState + ioSlot]);
                         }
                     }
@@ -175,7 +197,7 @@ namespace PepperDash.Essentials.Bridges
             }
         }
 
-        static void SetHdcpCapabilityAction(bool hdcpTypeSimple, HdmiInputWithCEC port, uint join, BasicTriList trilist)
+        static void SetHdcpStateAction(bool hdcpTypeSimple, HdmiInputWithCEC port, uint join, BasicTriList trilist)
         {
             if (hdcpTypeSimple)
             {
@@ -195,14 +217,14 @@ namespace PepperDash.Essentials.Bridges
             else
             {
                 trilist.SetUShortSigAction(join,
-                        new Action<ushort>(s =>
+                        new Action<ushort>(u =>
                         {
-                            port.HdcpReceiveCapability = (eHdcpCapabilityType)s;
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
                         }));
             }
         }
 
-        static void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)
+        static void SetHdcpStateAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist)
         {
             if (hdcpTypeSimple)
             {
@@ -222,14 +244,14 @@ namespace PepperDash.Essentials.Bridges
             else
             {
                 trilist.SetUShortSigAction(join,
-                        new Action<ushort>(s =>
+                        new Action<ushort>(u =>
                         {
-                            port.HdcpCapability = (eHdcpCapabilityType)s;
+                            port.HdcpCapability = (eHdcpCapabilityType)u;
                         }));
             }
         }
 
-        static void SetHdcpCapabilityAction(bool supportsHdcp2, DMInputPortWithCec port, uint join, BasicTriList trilist)
+        static void SetHdcpStateAction(bool supportsHdcp2, DMInputPortWithCec port, uint join, BasicTriList trilist)
         {
             if (!supportsHdcp2)
             {
@@ -249,9 +271,9 @@ namespace PepperDash.Essentials.Bridges
             else
             {
                 trilist.SetUShortSigAction(join,
-                        new Action<ushort>(s =>
+                        new Action<ushort>(u =>
                         {
-                            port.HdcpReceiveCapability = (eHdcpCapabilityType)s;
+                            port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
                         }));
             }
         }

PepperDashEssentials/PepperDashEssentials.csproj

@@ -71,9 +71,9 @@
       <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.3.27452, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\references\PepperDash_Core.dll</HintPath>
+      <HintPath>..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -183,6 +183,7 @@
     <Compile Include="HttpApiHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />

PepperDashEssentials/Properties/AssemblyInfo.cs

@@ -4,5 +4,5 @@
 [assembly: AssemblyCompany("PepperDash Technology Corp")]
 [assembly: AssemblyProduct("PepperDashEssentials")]
 [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")]
-[assembly: AssemblyVersion("1.4.444.*")]
+[assembly: AssemblyVersion("1.4.0.*")]
 

PepperDashEssentials/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Room.Config
 
         public EssentialsNDisplayRoomPropertiesConfig()
         {
-            DisplayKeys = new List<string>();
+            Displays = new Dictionary<string, string>();
         }
     }
 }

PepperDashEssentials/Room/Types/EssentialsNDisplayRoomBase.cs

@@ -4,13 +4,42 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Room.Config;
+
 namespace PepperDash.Essentials.Room.Types
 {
     /// <summary>
-    /// Base clas for rooms with more than a single display
+    /// Base class for rooms with more than a single display
     /// </summary>
-    //public abstract class EssentialsNDisplayRoomBase : EssentialsRoomBase
+    public abstract class EssentialsNDisplayRoomBase : EssentialsRoomBase
-    //{
+    {
+        public event SourceInfoChangeHandler CurrentSingleSourceChange;
 
-    //}
+        public Dictionary<string, IRoutingSinkWithSwitching> Displays { get; protected set; }
+
+        protected override Func<bool> IsWarmingFeedbackFunc { get { return () => false; ; } }
+        protected override Func<bool> IsCoolingFeedbackFunc { get { return () => false; } }
+
+        public EssentialsNDisplayRoomBase(DeviceConfig config)
+            : base (config)
+        {
+            Displays = new Dictionary<string, IRoutingSinkWithSwitching>();
+
+            var propertiesConfig = JsonConvert.DeserializeObject<EssentialsNDisplayRoomPropertiesConfig>(config.Properties.ToString());
+
+            foreach (var display in propertiesConfig.Displays)
+            {
+                var displayDevice = DeviceManager.GetDeviceForKey(display.Value) as IRoutingSinkWithSwitching;
+
+                if (displayDevice != null)
+                    Displays.Add(display.Key, displayDevice);
+            }
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -71,9 +71,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.1.26313, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -600,7 +600,7 @@ namespace PepperDash.Essentials.DM
                 AddOutputPortWithDebug(string.Format("outputCard{0}", number), "hdmiOut1", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, 2 * (number - 1) + 1, cecPort1);
                 AddOutputPortWithDebug(string.Format("outputCard{0}", number), "dmOut2", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, 2 * (number - 1) + 2);
             }
-            else if (type == "dmcStro")
+            else if (type == "dmcstro")
             {
                 var outputCard = new DmcStroSingle(number, Chassis);
                 AddOutputPortWithDebug(string.Format("outputCard{0}", number), "streamOut", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming, 2 * (number - 1) + 1);
@@ -647,10 +647,15 @@ namespace PepperDash.Essentials.DM
             Debug.Console(2, this, "Adding input port '{0}'", portKey);
             var inputPort = new RoutingInputPort(portKey, sigType, portType, cardNum, this);
 
-            if (cecPort != null)
+            if (inputPort != null)
-                inputPort.Port = cecPort;
+            {
+                if (cecPort != null)
+                    inputPort.Port = cecPort;
 
-            InputPorts.Add(inputPort);
+                InputPorts.Add(inputPort);
+            }
+            else
+                Debug.Console(2, this, "inputPort is null");
         }
 
         /// <summary>

essentials-framework/Essentials DM/Essentials_DM/Config/DMChassisConfig.cs

@@ -34,6 +34,11 @@ namespace PepperDash.Essentials.DM.Config
 
         [JsonProperty("inputSlotSupportsHdcp2")]
         public Dictionary<uint, bool> InputSlotSupportsHdcp2 { get; set; }
+
+        public DMChassisPropertiesConfig()
+        {
+            InputSlotSupportsHdcp2 = new Dictionary<uint, bool>();
+        }
     }
 
     /// <summary>

essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj

@@ -59,9 +59,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -63,9 +63,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>