Merge pull request #1173 from PepperDash/release/1.16.0

Release/1.16.0

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/CenIoCom/CenIoComController.cs

@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+	/// <summary>
+	/// Wrapper class for CEN-IO-COM-Xxx expander module
+	/// </summary>
+	[Description("Wrapper class for the CEN-IO-COM-102 & CEN-IO-COM-202 expander module")]
+	public class CenIoComController : CrestronGenericBaseDevice, IComPorts
+    {
+        private readonly CenIoCom _cenIoCom;
+
+        public CenIoComController(string key, string name, CenIoCom cenIo)
+			:base(key, name, cenIo)
+        {
+	        _cenIoCom = cenIo;
+        }
+
+        #region Implementation of IComPorts
+
+        public CrestronCollection<ComPort> ComPorts
+        {
+            get { return _cenIoCom.ComPorts; }
+        }
+
+        public int NumberOfComPorts
+        {
+            get { return _cenIoCom.NumberOfComPorts; }
+        }
+
+        #endregion
+
+    }
+
+	public class CenIoCom102ControllerFactory : EssentialsDeviceFactory<CenIoComController>
+	{
+		private const string CenIoCom102Type = "ceniocom102";
+		private const string CenIoCom202Type = "ceniocom202";
+
+        public CenIoCom102ControllerFactory()
+        {
+			TypeNames = new List<string> { CenIoCom102Type, CenIoCom202Type };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new CEN-IO-COM-Xxx Device");
+
+	        var control = CommFactory.GetControlPropertiesConfig(dc);
+	        if (control == null)
+	        {
+				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, control properties not found");
+				return null;
+	        }
+
+	        var ipid = control.IpIdInt;
+	        if (ipid < 2)
+	        {
+				Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid IP-ID found");
+				return null;
+	        }
+
+	        switch (dc.Type)
+	        {
+				case CenIoCom102Type:
+		        {
+					return new CenIoComController(dc.Key, dc.Name, new CenIoCom102(ipid, Global.ControlSystem));
+		        }
+				case CenIoCom202Type:
+		        {
+					return new CenIoComController(dc.Key, dc.Name, new CenIoCom202(ipid, Global.ControlSystem));
+		        }
+				default:
+		        {
+					Debug.Console(1, "Factory failed to create a new CEN-IO-COM-Xxx Device, invalid type '{0}'", dc.Type);
+					return null;
+		        }
+	        }
+        }
+    }
+}

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

@@ -185,6 +185,7 @@
     </Compile>
     <Compile Include="Crestron IO\Cards\CenCi33Controller.cs" />
     <Compile Include="Crestron IO\Cards\InternalCardCageController.cs" />
+    <Compile Include="Crestron IO\CenIoCom\CenIoComController.cs" />
     <Compile Include="Crestron IO\DinCenCn\DinCenCnController.cs" />
     <Compile Include="Crestron IO\DinCenCn\IHasCresnetBranches.cs" />
     <Compile Include="Crestron IO\DinIo8\DinIo8Controller.cs" />

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
@@ -98,7 +111,7 @@ namespace PepperDash_Essentials_DM.Chassis
 				Debug.Console(1, this, "Failed to setup inputs, properties are null");
 				return;
 			}
-			
+
 			// iterate through HDMI inputs
 			foreach (var item in _chassis.HdmiInputs)
 			{
@@ -111,7 +124,7 @@ namespace PepperDash_Essentials_DM.Chassis
 
 				input.Name.StringValue = name;
 
-				InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
 					() => InputNames[index]));
 
 				var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
@@ -121,11 +134,11 @@ namespace PepperDash_Essentials_DM.Chassis
 				Debug.Console(1, this, "Adding Input port: {0} - {1}", port.Key, name);
 				InputPorts.Add(port);
 
-				InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
 					() => input.InputPort.HdcpSupportOnFeedback.BoolValue));
 
-				VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
-					() => input.VideoDetectedFeedback.BoolValue));
+					() => input.InputPort.SyncDetectedFeedback.BoolValue));
 			}
 
 			// iterate through DM Lite inputs
@@ -134,13 +147,13 @@ namespace PepperDash_Essentials_DM.Chassis
 				var input = item;
 				var index = item.Number;
 				var key = string.Format("dmLiteIn{0}", index);
-				var name = string.IsNullOrEmpty(InputNames[index]) 
+				var name = string.IsNullOrEmpty(InputNames[index])
-					? string.Format("DM Input {0}", index) 
+					? string.Format("DM Input {0}", index)
 					: InputNames[index];
 
 				input.Name.StringValue = name;
 
-				InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				InputNameFeedbacks.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
 					() => InputNames[index]));
 
 				var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
@@ -150,11 +163,11 @@ namespace PepperDash_Essentials_DM.Chassis
 				Debug.Console(0, this, "Adding Input port: {0} - {1}", port.Key, name);
 				InputPorts.Add(port);
 
-				InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				InputHdcpEnableFeedback.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
 					() => input.InputPort.HdcpSupportOnFeedback.BoolValue));
 
-				VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
-					() => input.VideoDetectedFeedback.BoolValue));
+					() => input.InputPort.SyncDetectedFeedback.BoolValue));
 			}
 
 			_chassis.DMInputChange += _chassis_InputChange;
@@ -173,10 +186,10 @@ namespace PepperDash_Essentials_DM.Chassis
 			{
 				var output = item;
 				var index = item.Number;
-				var name = string.IsNullOrEmpty(OutputNames[index]) 
+				var name = string.IsNullOrEmpty(OutputNames[index])
-					? string.Format("Output {0}", index) 
+					? string.Format("Port {0}", index)
 					: OutputNames[index];
-				
+
 				output.Name.StringValue = name;
 
 				var hdmiKey = string.Format("hdmiOut{0}", index);
@@ -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,16 +207,23 @@ 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), 
-					() => output.VideoOutFeedback.NameFeedback.StringValue));			
 
-				VideoOutputRouteFeedbacks.Add(new IntFeedback(index.ToString(CultureInfo.InvariantCulture), 
+				OutputRouteNameFeedback.Add(new StringFeedback(index.ToString(CultureInfo.InvariantCulture),
+					() => output.VideoOutFeedback.NameFeedback.StringValue));
+
+				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}
@@ -332,8 +352,8 @@ Selector: {4}
 		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
 		{
 			var input = inputSelector as HdPsXxxInput;
-			var output = outputSelector as HdPsXxxOutput;			
+			var output = outputSelector as HdPsXxxOutput;
-			
+
 			Debug.Console(2, this, "ExecuteSwitch: input={0}, output={1}", input, output);
 
 			if (output == null)
@@ -413,6 +433,8 @@ Selector: {4}
 			_chassis.AutoRouteOff();
 		}
 
+
+
 		#region Events
 
 
@@ -434,24 +456,37 @@ Selector: {4}
 		// _chassis input change event
 		private void _chassis_InputChange(Switch device, DMInputEventArgs args)
 		{
-			var eventId = args.EventId;
+			switch (args.EventId)
-
-			switch (eventId)
 			{
-				case DMInputEventIds.VideoDetectedEventId:
+				case DMInputEventIds.RemoteTransmitterDetectedEventId:
+					{						
+						// signal found on HD-PSXxx > Inputs > Inputs DM Lite X
+						Debug.Console(2, this, "{0} DM Input Event ID {1}-RemoteTransmitterDetected | Number {2}",
+							device.ToString(), args.EventId, args.Number);
+						break;
+					}
+				case DMInputEventIds.SourceSyncEventId:		// id-14
+				case DMInputEventIds.VideoDetectedEventId:	// id-9
 					{
-						Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", eventId);
+						// signal found on HD-PSXxx > Inputs > HDMI/DM Lite X
-						foreach (var item in VideoInputSyncFeedbacks)
+						Debug.Console(1, this, "{0} DM Input Event ID {1} | Number {2}: Updating VideoInputSyncFeedbacks",
-						{
+							device.Name, args.EventId, args.Number);
-							item.FireUpdate();
+
-						}
+						var input = args.Number;
+
+						var feedback = VideoInputSyncFeedbacks[(int)input];
+						if (feedback == null) return;
+
+						feedback.FireUpdate();
+
 						break;
 					}
 				case DMInputEventIds.InputNameFeedbackEventId:
 				case DMInputEventIds.InputNameEventId:
 				case DMInputEventIds.NameFeedbackEventId:
 					{
-						Debug.Console(1, this, "Event ID {0}: Updating name feedbacks", eventId);
+						Debug.Console(1, this, "{0} DM Input Event ID {1}-Name | Number {2}: Updating name feedbacks",
+							device.Name, args.EventId, args.Number);
 
 						var input = args.Number;
 						var name = _chassis.HdmiInputs[input].NameFeedback.StringValue;
@@ -461,7 +496,8 @@ Selector: {4}
 					}
 				default:
 					{
-						Debug.Console(1, this, "Uhandled DM Input Event ID {0}", eventId);
+						Debug.Console(1, this, "{0} DM Input Event ID {1} | Number {2}: Uhandled", 
+							device.Name, args.EventId, args.Number);
 						break;
 					}
 			}
@@ -469,33 +505,53 @@ Selector: {4}
 			OnDmInputChange(args);
 		}
 
-
 		// _chassis output change event
 		private void _chassis_OutputChange(Switch device, DMOutputEventArgs args)
 		{
-			if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
+			switch (args.EventId)
+			{
+				case DMOutputEventIds.VideoOutEventId:
+				{
+					Debug.Console(2, this, "{0} DM Output Event Id {1} | Number {2} | Index {3}: VideoOutEventId",
+							device.Name, args.EventId, args.Number, args.Index);
 
-			var output = args.Number;
+					var output = args.Number;
 
-			var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
+					var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
-				? 0
+						? 0
-				: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
+						: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
 
-			var outputName = OutputNames[output];
+					var outputName = OutputNames[output];
 
-			var feedback = VideoOutputRouteFeedbacks[outputName];
+					var feedback = VideoOutputRouteFeedbacks[outputName];
-			if (feedback == null) return;
+					if (feedback == null) return;
 
-			var inputPort = InputPorts.FirstOrDefault(
+					var inputPort = InputPorts.FirstOrDefault(
-				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
+						p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
 
-			var outputPort = OutputPorts.FirstOrDefault(
+					var outputPort = OutputPorts.FirstOrDefault(
-				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
+						p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
 
-			feedback.FireUpdate();
+					feedback.FireUpdate();
 
-			OnSwitchChange(new RoutingNumericEventArgs(
+					OnSwitchChange(new RoutingNumericEventArgs(output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
-				output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
+
+					break;
+				}
+				case DMOutputEventIds.RemoteReceiverDetectedEventId:
+					{
+						// signal found on HD-PSXxx > Output[s] > Output [X] > DM Lite [X]
+						Debug.Console(2, this, "{0} DM Output Event Id {1} | Number {2} | Index {3}: RemoteRecevierDetectedEventId",
+							device.Name, args.EventId, args.Number, args.Index);
+						break;
+					}
+				default:
+					{
+						Debug.Console(2, this, "{0} DM Output Event Id {1} | Number {2} | Index:{3}: Unhandled",
+							device.Name, args.EventId, args.Number, args.Index);
+						break;
+					}
+			}
 		}
 
 
@@ -517,14 +573,15 @@ Selector: {4}
 		#endregion
 
 
+
 		#region Factory
 
 
-		public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
+		public class HdPsXxxControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
 		{
-			public HdSp401ControllerFactory()
+			public HdPsXxxControllerFactory()
 			{
-				TypeNames = new List<string>() { "hdps401", "hdps402", "hdps621", "hdps622" };
+				TypeNames = new List<string> { "hdps401", "hdps402", "hdps621", "hdps622" };
 			}
 			public override EssentialsDevice BuildDevice(DeviceConfig dc)
 			{
@@ -571,7 +628,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" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -994,7 +994,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             //Special Change for protected directory clear
 
-            trilist.SetBoolSigAction(joinMap.DirectoryClearSelected.JoinNumber, (b) => SelectDirectoryEntry(_directoryCodec, 0, _directoryTrilist, _directoryJoinmap));
+            trilist.SetBoolSigAction(joinMap.DirectoryClearSelected.JoinNumber, (b) => SelectDirectoryEntry(codec, 0, trilist, joinMap));
 
 		    // Report feedback for number of contact methods for selected contact
 

packages.config

@@ -1,3 +1,3 @@
 <packages>
-	<package id="PepperDashCore" version="1.3.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+	<package id="PepperDashCore" version="1.3.3-hotfix-390" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>