Merge branch 'main' into hotfix/bridge-warning-fix

fix: ghidra specific verbiage

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/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 DM/Essentials_DM/Chassis/HdPsXxxAnalogAuxMixerController.cs

@@ -7,39 +7,47 @@ using PepperDash.Essentials.Core;
 namespace PepperDash_Essentials_DM.Chassis
 {
 	public class HdPsXxxAnalogAuxMixerController : IKeyed,
-		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback // || IBasicVolumeWithFeedback
+		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
 	{
 		public string Key { get; private set; }
 
-		public HdPsXxxAnalogAuxMixer Mixer { 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 = chassis.AnalogAuxiliaryMixer[mixer];
 
-			Mixer.AuxMixerPropertyChange += OnAuxMixerPropertyChange;
-			Mixer.AuxiliaryMuteControl.MuteAndVolumeControlPropertyChange += OnMuteAndVolumeControlPropertyChange;
+			_mixer.AuxMixerPropertyChange += OnAuxMixerPropertyChange;
+			_mixer.AuxiliaryMuteControl.MuteAndVolumeControlPropertyChange += OnMuteAndVolumeControlPropertyChange;
 
 			VolumeLevelFeedback = new IntFeedback(() => VolumeLevel);
 			MuteFeedback = new BoolFeedback(() => IsMuted);
-
-			VolumeLevel = Mixer.VolumeFeedback.ShortValue;
-			IsMuted = Mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue;
 		}
 
 		#region Volume
 
 		private void OnAuxMixerPropertyChange(object sender, GenericEventArgs args)
 		{
-			Debug.Console(2, this, "AuxMixerPropertyChange: {0} > Index-{1}, EventId-{2}", sender.GetType().ToString(), args.Index, args.EventId);
+			Debug.Console(2, this, "OnAuxMixerPropertyChange: {0} > Index-{1}, EventId-{2}", sender.ToString(), args.Index, args.EventId);
 
 			switch (args.EventId)
 			{
-				case (3):
+				case MuteAndVolumeContorlEventIds.VolumeFeedbackEventId:
 					{
-						VolumeLevel = Mixer.VolumeFeedback.ShortValue;
+						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;
 					}
 			}
@@ -58,11 +66,12 @@ namespace PepperDash_Essentials_DM.Chassis
 		public int VolumeLevel
 		{
 			get { return _volumeLevel; }
-			set
+			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();
@@ -70,26 +79,25 @@ namespace PepperDash_Essentials_DM.Chassis
 		}
 
 		public IntFeedback VolumeLevelFeedback { get; private set; }
-		
+
 		public void SetVolume(ushort level)
 		{
-			var scaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax,
-				DeviceLevelMin);
+			var levelScaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
 
-			Debug.Console(1, this, "SetVolume: level-'{0}', scaled-'{1}'", level, scaled);
-
-			Mixer.Volume.ShortValue = (short)scaled;
+			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);
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
 			}
 			else
 			{
-				Mixer.Volume.StopRamp();
+				_mixer.Volume.StopRamp();
 			}
 		}
 
@@ -97,14 +105,11 @@ namespace PepperDash_Essentials_DM.Chassis
 		{
 			if (pressRelease)
 			{
-				//var remainingRatio = Mixer.Volume.UShortValue/CrestronLevelMax;
-				//Mixer.Volume.CreateRamp(CrestronLevelMin, (uint)(RampTime * remainingRatio));
-
-				Mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
 			}
 			else
 			{
-				Mixer.Volume.StopRamp();
+				_mixer.Volume.StopRamp();
 			}
 		}
 
@@ -121,12 +126,22 @@ namespace PepperDash_Essentials_DM.Chassis
 
 			switch (args.EventId)
 			{
-				case (1):
-				case (2):
+				case MuteAndVolumeContorlEventIds.VolumeFeedbackEventId:
 					{
-						IsMuted = Mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue;
+						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;
+				}
 			}
 		}
 
@@ -149,12 +164,12 @@ namespace PepperDash_Essentials_DM.Chassis
 
 		public void MuteOn()
 		{
-			Mixer.AuxiliaryMuteControl.MuteOn();
+			_mixer.AuxiliaryMuteControl.MuteOn();
 		}
 
 		public void MuteOff()
 		{
-			Mixer.AuxiliaryMuteControl.MuteOff();
+			_mixer.AuxiliaryMuteControl.MuteOff();
 		}
 
 		public void MuteToggle()

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

@@ -86,11 +86,13 @@ namespace PepperDash_Essentials_DM.Chassis
 			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);				
+				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);
 			}
 		}
@@ -109,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)
 			{
@@ -122,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)
@@ -132,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), 
-					() => input.VideoDetectedFeedback.BoolValue));
+				VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
+					() => input.InputPort.SyncDetectedFeedback.BoolValue));
 			}
 
 			// iterate through DM Lite inputs
@@ -145,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]) 
-					? string.Format("DM Input {0}", index) 
+				var name = string.IsNullOrEmpty(InputNames[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)
@@ -161,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), 
-					() => input.VideoDetectedFeedback.BoolValue));
+				VideoInputSyncFeedbacks.Add(new BoolFeedback(index.ToString(CultureInfo.InvariantCulture),
+					() => input.InputPort.SyncDetectedFeedback.BoolValue));
 			}
 
 			_chassis.DMInputChange += _chassis_InputChange;
@@ -184,10 +186,10 @@ namespace PepperDash_Essentials_DM.Chassis
 			{
 				var output = item;
 				var index = item.Number;
-				var name = string.IsNullOrEmpty(OutputNames[index]) 
-					? string.Format("Port {0}", index) 
+				var name = string.IsNullOrEmpty(OutputNames[index])
+					? string.Format("Port {0}", index)
 					: OutputNames[index];
-				
+
 				output.Name.StringValue = name;
 
 				var hdmiKey = string.Format("hdmiOut{0}", index);
@@ -207,21 +209,21 @@ namespace PepperDash_Essentials_DM.Chassis
 				};
 				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(0, this, "----> AnalogAuxillaryMixer.Count-{0}", _chassis.AnalogAuxiliaryMixer.Count);
+			/*
+			Debug.Console(2, this, "----> AnalogAuxillaryMixer.Count-{0}", _chassis.AnalogAuxiliaryMixer.Count);
 			foreach (var item in _chassis.AnalogAuxiliaryMixer)
 			{
-				Debug.Console(0, this, "----> AnalogAuxillaryMixer[{0}].LineMuteVolumeControl.Count-{1}", item.MixerNumber, item.LineMuteVolumeControl.Count);
-				Debug.Console(0, this, "----> AnalogAuxillaryMixer[{0}].SourceMuteVolumeControl.Count-{1}", item.MixerNumber, item.SourceMuteVolumeControl.Count);
+				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;
 		}
 
@@ -350,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)
@@ -454,24 +456,37 @@ Selector: {4}
 		// _chassis input change event
 		private void _chassis_InputChange(Switch device, DMInputEventArgs args)
 		{
-			var eventId = args.EventId;
-
-			switch (eventId)
+			switch (args.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);
-						foreach (var item in VideoInputSyncFeedbacks)
-						{
-							item.FireUpdate();
-						}
+						// signal found on HD-PSXxx > Inputs > HDMI/DM Lite X
+						Debug.Console(1, this, "{0} DM Input Event ID {1} | Number {2}: Updating VideoInputSyncFeedbacks",
+							device.Name, args.EventId, args.Number);
+
+						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;
@@ -481,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;
 					}
 			}
@@ -489,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
-				? 0
-				: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
+					var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
+						? 0
+						: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
 
-			var outputName = OutputNames[output];
+					var outputName = OutputNames[output];
 
-			var feedback = VideoOutputRouteFeedbacks[outputName];
-			if (feedback == null) return;
+					var feedback = VideoOutputRouteFeedbacks[outputName];
+					if (feedback == null) return;
 
-			var inputPort = InputPorts.FirstOrDefault(
-				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
+					var inputPort = InputPorts.FirstOrDefault(
+						p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
 
-			var outputPort = OutputPorts.FirstOrDefault(
-				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
+					var outputPort = OutputPorts.FirstOrDefault(
+						p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
 
-			feedback.FireUpdate();
+					feedback.FireUpdate();
 
-			OnSwitchChange(new RoutingNumericEventArgs(
-				output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
+					OnSwitchChange(new RoutingNumericEventArgs(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;
+					}
+			}
 		}
 
 
@@ -541,9 +577,9 @@ Selector: {4}
 		#region Factory
 
 
-		public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
+		public class HdPsXxxControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
 		{
-			public HdSp401ControllerFactory()
+			public HdPsXxxControllerFactory()
 			{
 				TypeNames = new List<string> { "hdps401", "hdps402", "hdps621", "hdps622" };
 			}

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

@@ -6,25 +6,56 @@ using PepperDash.Essentials.Core;
 namespace PepperDash_Essentials_DM.Chassis
 {
 	public class HdPsXxxOutputAudioController : IKeyed,
-		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback // || IBasicVolumeWithFeedback
+		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
 	{
 		public string Key { get; private set; }
 
-		public HdPsXxxOutputPort Port { 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;
+			_port = chassis.HdmiDmLiteOutputs[output].OutputPort;
+			_mixer = chassis.HdmiDmLiteOutputs[output].Mixer;
+
+			chassis.DMOutputChange += ChassisOnDmOutputChange;
 
 			VolumeLevelFeedback = new IntFeedback(() => VolumeLevel);
 			MuteFeedback = new BoolFeedback(() => IsMuted);
+		}
 
-			//if(Port.AudioOutput.Volume != null)
-			//    VolumeLevel = Port.AudioOutput.VolumeFeedback.UShortValue;
+		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);
 
-			IsMuted = Port.MuteOnFeedback.BoolValue;
+						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
@@ -42,11 +73,11 @@ namespace PepperDash_Essentials_DM.Chassis
 		public int VolumeLevel
 		{
 			get { return _volumeLevel; }
-			set
+			private set
 			{
 				var level = value;
-				//_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin);
-				_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
+
+				_volumeLevel = CrestronEnvironment.ScaleWithLimits(level, DeviceLevelMax, DeviceLevelMin, CrestronLevelMax, CrestronLevelMin);
 
 				Debug.Console(2, this, "VolumeFeedback: level-'{0}', scaled-'{1}'", level, _volumeLevel);
 
@@ -58,23 +89,22 @@ namespace PepperDash_Essentials_DM.Chassis
 
 		public void SetVolume(ushort level)
 		{
-			var scaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax,
-				DeviceLevelMin);
+			var levelScaled = CrestronEnvironment.ScaleWithLimits(level, CrestronLevelMax, CrestronLevelMin, DeviceLevelMax, DeviceLevelMin);
 
-			Debug.Console(1, this, "SetVolume: level-'{0}', scaled-'{1}'", level, scaled);
+			Debug.Console(1, this, "SetVolume: level-'{0}', levelScaled-'{1}'", level, levelScaled);
 
-			Port.AudioOutput.Volume.ShortValue = (short)scaled;
+			_mixer.Volume.ShortValue = (short)levelScaled;
 		}
 
 		public void VolumeUp(bool pressRelease)
 		{
 			if (pressRelease)
 			{
-				Port.AudioOutput.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMax, RampTime);
 			}
 			else
 			{
-				Port.AudioOutput.Volume.StopRamp();
+				_mixer.Volume.StopRamp();
 			}
 		}
 
@@ -82,11 +112,11 @@ namespace PepperDash_Essentials_DM.Chassis
 		{
 			if (pressRelease)
 			{
-				Port.AudioOutput.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
+				_mixer.Volume.CreateSignedRamp(DeviceLevelMin, RampTime);
 			}
 			else
 			{
-				Port.AudioOutput.Volume.StopRamp();
+				_mixer.Volume.StopRamp();
 			}
 		}
 
@@ -116,12 +146,12 @@ namespace PepperDash_Essentials_DM.Chassis
 
 		public void MuteOn()
 		{
-			Port.MuteOn();
+			_port.MuteOn();
 		}
 
 		public void MuteOff()
 		{
-			Port.MuteOff();
+			_port.MuteOff();
 		}
 
 		public void MuteToggle()

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>