feat: Adds IMobileControlMessenger

Feature/hdpsxxxx volume control

.gitignore

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

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 Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs

@@ -55,6 +55,8 @@ namespace PepperDash.Essentials.Core.Touchpanels
 					InitializeButton(buttonKey, buttonConfig);
 					InitializeButtonFeedback(buttonKey, buttonConfig);
 				}
+
+				ListButtons();
 			});
 		}
 
@@ -318,6 +320,23 @@ namespace PepperDash.Essentials.Core.Touchpanels
 
 			foreach (var eventType in button.EventTypes[type]) DeviceJsonApi.DoDeviceAction(eventType);
 		}
+
+
+		public void ListButtons()
+		{
+			var line = new string('-', 35);
+
+			Debug.Console(0, this, line);
+
+			Debug.Console(0, this, "MPC3 Controller {0} - Available Butons", Key);
+
+			foreach (var button in _buttons)
+			{
+				Debug.Console(0, this, "Key: {0}", button.Key);
+			}
+
+			Debug.Console(0, this, line);
+		}
 	}
 
 	/// <summary>

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

@@ -0,0 +1,185 @@
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_DM.Chassis
+{
+	public class HdPsXxxAnalogAuxMixerController : IKeyed,
+		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
+	{
+		public string Key { get; private set; }
+
+		private readonly HdPsXxxAnalogAuxMixer _mixer;
+
+		public HdPsXxxAnalogAuxMixerController(string parent, uint mixer, HdPsXxx chassis)
+		{
+			Key = string.Format("{0}-analogMixer{1}", parent, mixer);
+
+			_mixer = chassis.AnalogAuxiliaryMixer[mixer];
+
+			_mixer.AuxMixerPropertyChange += OnAuxMixerPropertyChange;
+			_mixer.AuxiliaryMuteControl.MuteAndVolumeControlPropertyChange += OnMuteAndVolumeControlPropertyChange;
+
+			VolumeLevelFeedback = new IntFeedback(() => VolumeLevel);
+			MuteFeedback = new BoolFeedback(() => IsMuted);
+		}
+
+		#region Volume
+
+		private void OnAuxMixerPropertyChange(object sender, GenericEventArgs args)
+		{
+			Debug.Console(2, this, "OnAuxMixerPropertyChange: {0} > Index-{1}, EventId-{2}", sender.ToString(), args.Index, args.EventId);
+
+			switch (args.EventId)
+			{
+				case MuteAndVolumeContorlEventIds.VolumeFeedbackEventId:
+					{
+						VolumeLevel = _mixer.VolumeFeedback.ShortValue;
+						break;
+					}
+				case MuteAndVolumeContorlEventIds.MuteOnEventId:
+				case MuteAndVolumeContorlEventIds.MuteOffEventId:
+					{
+						IsMuted = _mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue;
+						break;
+					}
+				default:
+					{
+						Debug.Console(1, this, "OnAuxMixerPropertyChange: {0} > Index-{1}, EventId-{2} - unhandled eventId", sender.ToString(), args.Index, args.EventId);
+						break;
+					}
+			}
+		}
+
+		private const ushort CrestronLevelMin = 0;
+		private const ushort CrestronLevelMax = 65535;
+
+		private const int DeviceLevelMin = -800;
+		private const int DeviceLevelMax = 200;
+
+		private const int RampTime = 5000;
+
+		private int _volumeLevel;
+
+		public int VolumeLevel
+		{
+			get { return _volumeLevel; }
+			private set
+			{
+				var level = value;
+				
+				_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin);
+				
+				Debug.Console(1, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel);
+
+				VolumeLevelFeedback.FireUpdate();
+			}
+		}
+
+		public IntFeedback VolumeLevelFeedback { get; private set; }
+
+		public void SetVolume(ushort level)
+		{
+			var levelScaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
+
+			Debug.Console(1, this, "SetVolume: level-'{0}', levelScaled-'{1}'", level, levelScaled);
+			
+			_mixer.Volume.ShortValue = (short)levelScaled;
+		}
+
+		public void VolumeUp(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
+			}
+			else
+			{
+				_mixer.Volume.StopRamp();
+			}
+		}
+
+		public void VolumeDown(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
+			}
+			else
+			{
+				_mixer.Volume.StopRamp();
+			}
+		}
+
+		#endregion
+
+
+
+
+		#region Mute
+
+		private void OnMuteAndVolumeControlPropertyChange(MuteControl device, GenericEventArgs args)
+		{
+			Debug.Console(2, this, "OnMuteAndVolumeControlPropertyChange: {0} > Index-{1}, EventId-{2}", device.ToString(), args.Index, args.EventId);
+
+			switch (args.EventId)
+			{
+				case MuteAndVolumeContorlEventIds.VolumeFeedbackEventId:
+					{
+						VolumeLevel = _mixer.VolumeFeedback.ShortValue;
+						break;
+					}
+				case MuteAndVolumeContorlEventIds.MuteOnEventId:
+				case MuteAndVolumeContorlEventIds.MuteOffEventId:
+					{
+						IsMuted = _mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue;
+						break;
+					}
+				default:
+				{
+					Debug.Console(1, this, "OnMuteAndVolumeControlPropertyChange: {0} > Index-{1}, EventId-{2} - unhandled eventId", device.ToString(), args.Index, args.EventId);
+					break;
+				}
+			}
+		}
+
+		private bool _isMuted;
+
+		public bool IsMuted
+		{
+			get { return _isMuted; }
+			set
+			{
+				_isMuted = value;
+
+				Debug.Console(1, this, "IsMuted: _isMuted-'{0}'", _isMuted);
+
+				MuteFeedback.FireUpdate();
+			}
+		}
+
+		public BoolFeedback MuteFeedback { get; private set; }
+
+		public void MuteOn()
+		{
+			_mixer.AuxiliaryMuteControl.MuteOn();
+		}
+
+		public void MuteOff()
+		{
+			_mixer.AuxiliaryMuteControl.MuteOff();
+		}
+
+		public void MuteToggle()
+		{
+			if (IsMuted)
+				MuteOff();
+			else
+				MuteOn();
+		}
+
+		#endregion
+	}
+}

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

@@ -82,6 +82,19 @@ namespace PepperDash_Essentials_DM.Chassis
 
 			OutputNames = props.Outputs;
 			SetupOutputs(OutputNames);
+
+			foreach (var item in _chassis.HdmiDmLiteOutputs)
+			{
+				var audioDevice = new HdPsXxxOutputAudioController(Key, item.Number, _chassis);
+				Debug.Console(2, this, "Adding HdPsXxxOutputAudioController '{0}' for output '{1}'", audioDevice.Key, item.Number);
+				DeviceManager.AddDevice(audioDevice);
+			}			
+			foreach (var item in _chassis.AnalogAuxiliaryMixer)
+			{
+				var audioDevice = new HdPsXxxAnalogAuxMixerController(Key, item.MixerNumber, _chassis);
+				Debug.Console(2, this, "Adding HdPsXxAnalogAuxMixerCOntorller '{0}' for output '{1}'", audioDevice.Key, item.MixerNumber);
+				DeviceManager.AddDevice(audioDevice);
+			}
 		}
 
 		// get input priorities
@@ -174,7 +187,7 @@ namespace PepperDash_Essentials_DM.Chassis
 				var output = item;
 				var index = item.Number;
 				var name = string.IsNullOrEmpty(OutputNames[index]) 
-					? string.Format("Output {0}", index) 
+					? string.Format("Port {0}", index) 
 					: OutputNames[index];
 				
 				output.Name.StringValue = name;
@@ -185,7 +198,7 @@ namespace PepperDash_Essentials_DM.Chassis
 					FeedbackMatchObject = output,
 					Port = output.HdmiOutput.HdmiOutputPort
 				};
-				Debug.Console(1, this, "Adding Output port: {0} - {1}", hdmiPort.Key, name);
+				Debug.Console(1, this, "Adding Port port: {0} - {1}", hdmiPort.Key, name);
 				OutputPorts.Add(hdmiPort);
 
 				var dmLiteKey = string.Format("dmLiteOut{0}", index);
@@ -194,7 +207,7 @@ namespace PepperDash_Essentials_DM.Chassis
 					FeedbackMatchObject = output,
 					Port = output.DmLiteOutput.DmLiteOutputPort
 				};
-				Debug.Console(1, this, "Adding Output port: {0} - {1}", dmLitePort.Key, name);
+				Debug.Console(1, this, "Adding Port port: {0} - {1}", dmLitePort.Key, name);
 				OutputPorts.Add(dmLitePort);
 				
 				OutputRouteNameFeedback.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture), 
@@ -203,7 +216,14 @@ namespace PepperDash_Essentials_DM.Chassis
 				VideoOutputRouteFeedbacks.Add(new IntFeedback(index.ToString(CultureInfo.InvariantCulture), 
 					() => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
 			}
-
+			/*
+			Debug.Console(2, this, "----> AnalogAuxillaryMixer.Count-{0}", _chassis.AnalogAuxiliaryMixer.Count);
+			foreach (var item in _chassis.AnalogAuxiliaryMixer)
+			{
+				Debug.Console(2, this, "----> AnalogAuxillaryMixer[{0}].LineMuteVolumeControl.Count-{1}", item.MixerNumber, item.LineMuteVolumeControl.Count);
+				Debug.Console(2, this, "----> AnalogAuxillaryMixer[{0}].SourceMuteVolumeControl.Count-{1}", item.MixerNumber, item.SourceMuteVolumeControl.Count);
+			}
+			*/
 			_chassis.DMOutputChange += _chassis_OutputChange;
 		}
 
@@ -224,7 +244,7 @@ Selector: {4}
 
 				foreach (var port in OutputPorts)
 				{
-					Debug.Console(0, this, @"Output Port Key: {0}
+					Debug.Console(0, this, @"Port Port Key: {0}
 Port: {1}
 Type: {2}
 ConnectionType: {3}
@@ -413,6 +433,8 @@ Selector: {4}
 			_chassis.AutoRouteOff();
 		}
 
+
+
 		#region Events
 
 
@@ -517,6 +539,7 @@ Selector: {4}
 		#endregion
 
 
+
 		#region Factory
 
 
@@ -524,7 +547,7 @@ Selector: {4}
 		{
 			public HdSp401ControllerFactory()
 			{
-				TypeNames = new List<string>() { "hdps401", "hdps402", "hdps621", "hdps622" };
+				TypeNames = new List<string> { "hdps401", "hdps402", "hdps621", "hdps622" };
 			}
 			public override EssentialsDevice BuildDevice(DeviceConfig dc)
 			{
@@ -571,7 +594,7 @@ Selector: {4}
 		}
 
 
-		#endregion		
+		#endregion
 	}
 
 

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

@@ -0,0 +1,167 @@
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DM;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_DM.Chassis
+{
+	public class HdPsXxxOutputAudioController : IKeyed,
+		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
+	{
+		public string Key { get; private set; }
+
+		private readonly HdPsXxxHdmiDmLiteOutputMixer _mixer;	// volume/volumeFeedback
+		private readonly HdPsXxxOutputPort _port;				// mute/muteFeedback
+
+		public HdPsXxxOutputAudioController(string parent, uint output, HdPsXxx chassis)
+		{
+			Key = string.Format("{0}-audioOut{1}", parent, output);
+
+			_port = chassis.HdmiDmLiteOutputs[output].OutputPort;
+			_mixer = chassis.HdmiDmLiteOutputs[output].Mixer;
+
+			chassis.DMOutputChange += ChassisOnDmOutputChange;
+
+			VolumeLevelFeedback = new IntFeedback(() => VolumeLevel);
+			MuteFeedback = new BoolFeedback(() => IsMuted);
+		}
+
+		private void ChassisOnDmOutputChange(Switch device, DMOutputEventArgs args)
+		{
+			switch (args.EventId)
+			{
+				case (DMOutputEventIds.VolumeEventId):
+					{
+						Debug.Console(2, this, "HdPsXxxOutputAudioController: {0} > Index-{1}, Number-{3}, EventId-{2} - AudioMute/UnmuteEventId",
+							device.ToString(), args.Index, args.EventId, args.Number);
+
+						VolumeLevel = _mixer.VolumeFeedback.ShortValue;
+
+						break;
+					}
+				case DMOutputEventIds.MuteOnEventId:
+				case DMOutputEventIds.MuteOffEventId:
+					{
+						Debug.Console(2, this, "HdPsXxxOutputAudioController: {0} > Index-{1}, Number-{3}, EventId-{2} - MuteOnEventId/MuteOffEventId",
+							device.ToString(), args.Index, args.EventId, args.Number);
+						
+						IsMuted = _port.MuteOnFeedback.BoolValue;
+						
+						break;
+					}
+				default:
+					{
+						Debug.Console(1, this, "HdPsXxxOutputAudioController: {0} > Index-{1}, Number-{3}, EventId-{2} - unhandled eventId", 
+							device.ToString(), args.Index, args.EventId, args.Number);
+						break;
+					}
+			}
+		}
+
+		#region Volume
+
+		private const ushort CrestronLevelMin = 0;
+		private const ushort CrestronLevelMax = 65535;
+
+		private const int DeviceLevelMin = -800;
+		private const int DeviceLevelMax = 200;
+
+		private const int RampTime = 5000;
+
+		private int _volumeLevel;
+
+		public int VolumeLevel
+		{
+			get { return _volumeLevel; }
+			private set
+			{
+				var level = value;
+
+				_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin);
+
+				Debug.Console(2, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel);
+
+				VolumeLevelFeedback.FireUpdate();
+			}
+		}
+
+		public IntFeedback VolumeLevelFeedback { get; private set; }
+
+		public void SetVolume(ushort level)
+		{
+			var levelScaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
+
+			Debug.Console(1, this, "SetVolume: level-'{0}', levelScaled-'{1}'", level, levelScaled);
+
+			_mixer.Volume.ShortValue = (short)levelScaled;
+		}
+
+		public void VolumeUp(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
+			}
+			else
+			{
+				_mixer.Volume.StopRamp();
+			}
+		}
+
+		public void VolumeDown(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
+			}
+			else
+			{
+				_mixer.Volume.StopRamp();
+			}
+		}
+
+		#endregion
+
+
+
+
+		#region Mute
+
+		private bool _isMuted;
+
+		public bool IsMuted
+		{
+			get { return _isMuted; }
+			set
+			{
+				_isMuted = value;
+
+				Debug.Console(1, this, "IsMuted: _isMuted-'{0}'", _isMuted);
+
+				MuteFeedback.FireUpdate();
+			}
+		}
+
+		public BoolFeedback MuteFeedback { get; private set; }
+
+		public void MuteOn()
+		{
+			_port.MuteOn();
+		}
+
+		public void MuteOff()
+		{
+			_port.MuteOff();
+		}
+
+		public void MuteToggle()
+		{
+			if (IsMuted)
+				MuteOff();
+			else
+				MuteOn();
+		}
+
+		#endregion
+	}
+}

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

@@ -15,6 +15,9 @@ namespace PepperDash_Essentials_DM.Config
 		[JsonProperty("outputs")]
 		public Dictionary<uint, string> Outputs { get; set; }
 
+		[JsonProperty("volumeMixerId")]
+		public uint VolumeMixerId { get; set; }
+
 		// "inputPriorities": "1,4,3,2"
 		[JsonProperty("inputPriorities")]
 		public string InputPriorities { get; set; }

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

@@ -104,7 +104,9 @@
     <Compile Include="Chassis\HdMd8xNController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEBridgeableController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEController.cs" />
+    <Compile Include="Chassis\HdPsXxxAnalogAuxMixerController.cs" />
     <Compile Include="Chassis\HdPsXxxController.cs" />
+    <Compile Include="Chassis\HdPsXxxOutputAudioController.cs" />
     <Compile Include="Config\HdPsXxxPropertiesConfig.cs" />
     <Compile Include="Config\InputPropertiesConfig.cs" />
     <Compile Include="Endpoints\EndpointInterfaces.cs" />