Merge branch 'development' into feature/mobile-control-interfaces

Feature/video wall mode

.gitignore

@@ -390,3 +390,4 @@ MigrationBackup/
 FodyWeavers.xsd
 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
 .DS_Store
+._.DS_Store

CONTRIBUTING.md

@@ -91,8 +91,8 @@ we receive and the availability of resources to evaluate contributions, we antic
   project remains dynamic and relevant.  This may  affect our responsiveness and ability to accept pull requests 
   quickly.  This does not mean we are ignoring them.
 - Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community.        
-  There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own 
-  repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we 
+  There may be times when we recommend that you just share your code for some enhancement to Essentials from your own 
+  repository. As we identify and recognize extensions that are of general interest to Essentials, we 
   may seek to incorporate them with our baseline.
 
 ## Legal

PepperDashEssentials/Bridges/EiscBridge.cs

@@ -70,7 +70,7 @@ namespace PepperDash.Essentials.Bridges
                     catch (NullReferenceException)
                     {
                         Debug.ConsoleWithLog(0, this,
-                            "Please update the bridge config to use EiscBridgeAdvanced with this device: {0}", device.Key);
+                            "Please update the bridge config to use eiscApiAdvanced with this device: {0}", device.Key);
                     }
                 }
                 Debug.Console(1, this, "Devices Linked.");

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -20,6 +20,18 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
 
+        [JoinName("HdmiInHdcpSupportOn")]
+        public JoinDataComplete HdmiInHdcpSupportOn = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "Turns on HDCP support for HDMI in.  Reports state as FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HdmiInHdcpSupportOff")]
+        public JoinDataComplete HdmiInHdcpSupportOff = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "Turns off HDCP support for HDMI in.  Reports state as FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HdmiInDisabledByHdcp")]
+        public JoinDataComplete HdmiInDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata { Description = "Reports if ", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
         [JoinName("VideoOut")]
         public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -68,7 +68,13 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
+        [JoinName("ScalerOutWallMode")]
+        public JoinDataComplete ScalerOutWallMode = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata { Description = "Set Wall Mode for Scaler video Wall mode", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
+        [JoinName("ScalerOutWallModeRaw")]
+        public JoinDataComplete ScalerOutWallModeRaw = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+            new JoinMetadata { Description = "Set Wall Mode for Scaler video Wall mode", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -1,5 +1,6 @@
 using System;
-using PepperDash.Core;
+using PepperDash.Core;
+using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
@@ -11,14 +12,47 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
-    }
-
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl3 : IMobileControl
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+    }
+
+    /// <summary>
+    /// Describes a MobileSystemController that accepts IEssentialsRoom
+    /// </summary>
+    public interface IMobileControl3 : IMobileControl
+    {
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+
+        void SendMessageObject(object o);
+
+        void AddAction(string key, object action);
+
+        void RemoveAction(string key);
+
+        void AddDeviceMessenger(IMobileControlMessenger messenger);
+
+        bool CheckForDeviceMessenger(string key);
+    }
+
+    /// <summary>
+    /// Describes a mobile control messenger
+    /// </summary>
+    public interface IMobileControlMessenger : IKeyed
+    {
+        IMobileControl3 AppServerController { get; }
+        string MessagePath { get; }
+        void RegisterWithAppServer(IMobileControl3 appServerController);
+    }
+
+    public interface IMobileControlResponseMessage
+    {
+        [JsonProperty("type")]
+        string Type { get; }
+
+        [JsonProperty("clientId")]
+        object ClientId { get; }
+
+        [JsonProperty("content")]
+        object Content { get; }
+
     }
 
     /// <summary>

essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs

@@ -43,11 +43,12 @@ namespace PepperDash.Essentials.DM.AirMedia
         public BoolFeedback HdmiVideoSyncDetectedFeedback { get; private set; }
         public StringFeedback SerialNumberFeedback { get; private set; }
         public BoolFeedback AutomaticInputRoutingEnabledFeedback { get; private set; }
+        public BoolFeedback HdmiInHdcpSupportOnFeedback { get; private set; }
+        public BoolFeedback HdmiInDisabledByHdcpFeedback { get; private set; }
 
         public AirMediaController(string key, string name, Am3x00 device, DeviceConfig dc, AirMediaPropertiesConfig props)
             : base(key, name, device)
         {
-
             AirMedia = device;
 
             DeviceConfig = dc;
@@ -101,6 +102,8 @@ namespace PepperDash.Essentials.DM.AirMedia
             LoginCodeFeedback = new IntFeedback(() => AirMedia.AirMedia.LoginCodeFeedback.UShortValue);
             ConnectionAddressFeedback = new StringFeedback(() => AirMedia.AirMedia.ConnectionAddressFeedback.StringValue);
             HostnameFeedback = new StringFeedback(() => AirMedia.AirMedia.HostNameFeedback.StringValue);
+            HdmiInHdcpSupportOnFeedback = new BoolFeedback(() => AirMedia.HdmiIn.HdcpSupportOnFeedback.BoolValue);
+            HdmiInDisabledByHdcpFeedback = new BoolFeedback(() => AirMedia.HdmiIn.DisabledByHdcpFeedback.BoolValue);
 
             // TODO: Figure out if we can actually get the TSID/Serial
             SerialNumberFeedback = new StringFeedback(() => "unknown");
@@ -178,6 +181,13 @@ namespace PepperDash.Essentials.DM.AirMedia
             ConnectionAddressFeedback.LinkInputSig(trilist.StringInput[joinMap.ConnectionAddressFB.JoinNumber]);
             HostnameFeedback.LinkInputSig(trilist.StringInput[joinMap.HostnameFB.JoinNumber]);
             SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumberFeedback.JoinNumber]);
+
+            trilist.SetSigFalseAction(joinMap.HdmiInHdcpSupportOn.JoinNumber, () => SetHcdpSupport(true));
+            HdmiInHdcpSupportOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInHdcpSupportOn.JoinNumber]);
+            trilist.SetSigFalseAction(joinMap.HdmiInHdcpSupportOff.JoinNumber, () => SetHcdpSupport(false));
+            HdmiInHdcpSupportOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.HdmiInHdcpSupportOff.JoinNumber]);
+
+            HdmiInDisabledByHdcpFeedback.LinkInputSig(trilist.BooleanInput[joinMap.HdmiInDisabledByHdcp.JoinNumber]);
         }
 
         /// <summary>
@@ -248,6 +258,14 @@ namespace PepperDash.Essentials.DM.AirMedia
         {
             if (args.EventId == DMInputEventIds.SourceSyncEventId)
                 HdmiVideoSyncDetectedFeedback.FireUpdate();
+            else if (args.EventId == DMInputEventIds.HdcpSupportOnEventId)
+            {
+                HdmiInHdcpSupportOnFeedback.FireUpdate();
+            }
+            else if (args.EventId == DMInputEventIds.DisabledByHdcpEventId)
+            {
+                HdmiInDisabledByHdcpFeedback.FireUpdate();
+            }
         }
 
         /// <summary>
@@ -296,6 +314,14 @@ namespace PepperDash.Essentials.DM.AirMedia
             AirMedia.DisplayControl.VideoOut = AmX00DisplayControl.eAirMediaX00VideoSource.AirBoard;
         }
 
+        public void SetHcdpSupport(bool on)
+        {
+            if (on)
+                AirMedia.HdmiIn.HdcpSupportOn();
+            else
+                AirMedia.HdmiIn.HdcpSupportOff();
+        }
+
         /// <summary>
         /// Reboots the device
         /// </summary>

essentials-framework/Essentials DM/Essentials_DM/Endpoints/EndpointInterfaces.cs

@@ -87,5 +87,11 @@ namespace PepperDash_Essentials_DM
     public interface IHasDisplayPortInHdcp : IHasDisplayPortInHdcpGet, IHasDisplayPortInHdcpSet
     {
         eHdcpCapabilityType DisplayPortInHdcpCapability { get; }
+    }
+
+    public interface IhasWallMode
+    {
+        void SetWallMode(ushort walLMode);
     }
+
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs

@@ -10,12 +10,13 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Core;
 using PepperDash_Essentials_DM;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.DM
 {
     [Description("Wrapper Class for DM-RMC-4K-Z-SCALER-C")]
     public class DmRmc4kZScalerCController : DmRmcControllerBase, IRmcRoutingWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp, IHasHdmiInHdcp
+        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp, IHasHdmiInHdcp, IhasWallMode
     {
         private readonly DmRmc4kzScalerC _rmc;
 
@@ -26,9 +27,10 @@ namespace PepperDash.Essentials.DM
         public IntFeedback DmInHdcpStateFeedback { get; private set; }
         public IntFeedback HdmiInHdcpStateFeedback { get; private set; }
 
+
         public BoolFeedback HdmiVideoSyncFeedback { get; private set; }
 
-
+        private Dictionary<ushort, EndpointScalerOutput.eWall> WallModes;
 
         /// <summary>
         /// The value of the current video source for the HDMI output on the receiver
@@ -87,6 +89,9 @@ namespace PepperDash.Essentials.DM
 
             VideoOutputResolutionFeedback = new StringFeedback(() => _rmc.HdmiOutput.GetVideoResolutionString());
 
+			VideoWallModeRawFeedback = new IntFeedback("ScalerVideoWallModeRaw",
+				() => (int)_rmc.Scaler.WallModeRawFeedback.UShortValue);
+
             InputPorts = new RoutingPortCollection<RoutingInputPort> { DmIn, HdmiIn };
             OutputPorts = new RoutingPortCollection<RoutingOutputPort> { HdmiOut };
 
@@ -94,6 +99,7 @@ namespace PepperDash.Essentials.DM
             _rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
             _rmc.HdmiIn.InputStreamChange += InputStreamChangeEvent;
             _rmc.DmInput.InputStreamChange += InputStreamChangeEvent;
+            _rmc.Scaler.OutputChange += Scaler_OutputChange;
 
             _rmc.OnlineStatusChange += _rmc_OnlineStatusChange;
 
@@ -101,6 +107,15 @@ namespace PepperDash.Essentials.DM
             HdmiOut.Port = _rmc.HdmiOutput;
 
             AudioVideoSourceNumericFeedback = new IntFeedback(() => (ushort)(_rmc.SelectedSourceFeedback));
+
+            WallModes = new Dictionary<ushort, EndpointScalerOutput.eWall>()
+            {
+                {0, EndpointScalerOutput.eWall.Disabled},
+                {2211, EndpointScalerOutput.eWall.Mode11},
+                {2212, EndpointScalerOutput.eWall.Mode12},
+                {2221, EndpointScalerOutput.eWall.Mode13},
+                {2222, EndpointScalerOutput.eWall.Mode14}
+            };
         }
 
         void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
@@ -241,5 +256,47 @@ namespace PepperDash.Essentials.DM
             _rmc.HdmiIn.HdcpCapability = hdcpState;
         }
 
+
+        #region IhasWallMode Members
+
+        public void SetWallMode(ushort wallMode)
+        {
+            EndpointScalerOutput.eWall wallValue;
+
+            if (WallModes.TryGetValue(wallMode, out wallValue))
+                _rmc.Scaler.WallMode = wallValue;
+        }
+
+        #endregion
+
+        public void SetWallModeRaw(ushort wallMode)
+        {
+            _rmc.Scaler.WallModeRaw.UShortValue = wallMode;
+        }
+
+		void Scaler_OutputChange(EndpointScalerOutput scalerOutput, ScalerOutputEventArgs args) 
+		{
+			if (scalerOutput == null)
+			{
+				Debug.Console(1, this, "Scaler Output object is null");
+				return;
+			}
+			if (args == null)
+			{
+				Debug.Console(1, this, "Scaler Output Args are null");
+				return;
+			}
+			Debug.Console(2, this, "Scaler Event ID: {0}", args.EventId);
+			switch (args.EventId)
+			{
+				case ScalerOutputEventIds.WallModeFeedbackEventId:
+					VideoWallModeRawFeedback.FireUpdate();
+					break;
+				default:
+					Debug.Console(2, this, "Scaler Default Unhandled Event ID: {0}", args.EventId);
+					break;
+			}			
+		}
+        
     }
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs

@@ -28,6 +28,9 @@ namespace PepperDash.Essentials.DM
         public StringFeedback EdidPreferredTimingFeedback { get; protected set; }
         public StringFeedback EdidSerialNumberFeedback { get; protected set; }
 
+        public IntFeedback VideoWallModeFeedback { get; protected set; }
+        public IntFeedback VideoWallModeRawFeedback { get; protected set; }
+
         protected DmRmcControllerBase(string key, string name, EndpointReceiverBase device)
             : base(key, name, device)
         {
@@ -59,8 +62,8 @@ namespace PepperDash.Essentials.DM
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
+            }
+
             LinkDmRmcToApi(rmc, trilist, joinMap);
         }
 
@@ -142,18 +145,18 @@ namespace PepperDash.Essentials.DM
 
             trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)hdcpCapability;
 
-            trilist.UShortInput[joinMap.HdcpInputPortCount.JoinNumber].UShortValue = (ushort)routing.InputPorts.Count;
-
-            var dmRmcScalerCBasicVideoMuteWithFeedback = rmc as IBasicVideoMuteWithFeedback;
-
-            if (dmRmcScalerCBasicVideoMuteWithFeedback != null)
-            {
-                Debug.Console(1, this, "Device is IBasicVideoMuteWithFeedback, linking video mute");
-                trilist.SetSigTrueAction(joinMap.VideoMuteToggle.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteToggle());
-                trilist.SetSigTrueAction(joinMap.VideoMuteOn.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteOn());
-                trilist.SetSigTrueAction(joinMap.VideoMuteOff.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteOff());
-                dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteIsOn.LinkInputSig(trilist.BooleanInput[joinMap.VideoMuteOn.JoinNumber]);
-                dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteIsOn.LinkComplementInputSig(trilist.BooleanInput[joinMap.VideoMuteOff.JoinNumber]);
+            trilist.UShortInput[joinMap.HdcpInputPortCount.JoinNumber].UShortValue = (ushort)routing.InputPorts.Count;
+
+            var dmRmcScalerCBasicVideoMuteWithFeedback = rmc as IBasicVideoMuteWithFeedback;
+
+            if (dmRmcScalerCBasicVideoMuteWithFeedback != null)
+            {
+                Debug.Console(1, this, "Device is IBasicVideoMuteWithFeedback, linking video mute");
+                trilist.SetSigTrueAction(joinMap.VideoMuteToggle.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteToggle());
+                trilist.SetSigTrueAction(joinMap.VideoMuteOn.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteOn());
+                trilist.SetSigTrueAction(joinMap.VideoMuteOff.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteOff());
+                dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteIsOn.LinkInputSig(trilist.BooleanInput[joinMap.VideoMuteOn.JoinNumber]);
+                dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteIsOn.LinkComplementInputSig(trilist.BooleanInput[joinMap.VideoMuteOff.JoinNumber]);
             }
 
             var routingWithFeedback = routing as IRmcRouting;
@@ -167,8 +170,23 @@ namespace PepperDash.Essentials.DM
             trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber,
                 a => routingWithFeedback.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
 
+            var dmRmcScalerWithVideowall = rmc as DmRmc4kZScalerCController;
+
+            if (dmRmcScalerWithVideowall != null)
+            {
+                trilist.SetUShortSigAction(joinMap.ScalerOutWallMode.JoinNumber, a => dmRmcScalerWithVideowall.SetWallMode(a));
+                trilist.SetUShortSigAction(joinMap.ScalerOutWallModeRaw.JoinNumber, a => dmRmcScalerWithVideowall.SetWallModeRaw(a));
+
+				if (rmc.VideoWallModeFeedback != null)
+					rmc.VideoWallModeFeedback.LinkInputSig(trilist.UShortInput[joinMap.ScalerOutWallMode.JoinNumber]);
+				if (rmc.VideoWallModeRawFeedback != null)
+					rmc.VideoWallModeRawFeedback.LinkInputSig(trilist.UShortInput[joinMap.ScalerOutWallModeRaw.JoinNumber]);
+
+            }
+
         }
 
+
         #region Implementation of IDeviceInfoProvider
 
         public DeviceInfo DeviceInfo { get; private set; }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmcScalerCController.cs

@@ -51,6 +51,7 @@ namespace PepperDash.Essentials.DM
 		    InputPorts = new RoutingPortCollection<RoutingInputPort> {DmIn};
 		    OutputPorts = new RoutingPortCollection<RoutingOutputPort> {HdmiOut};
 
+
             // Set Ports for CEC
             HdmiOut.Port = _rmc.HdmiOutput;
         }

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

@@ -59,7 +59,7 @@
       <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.3.3.32940, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>