feat: add output audio controller

fix: list available buttons on startup

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,107 @@
+using System;
+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 // || IBasicVolumeWithFeedback
+	{
+		public string Key { get; private set; }
+
+		public HdPsXxxAnalogAuxMixer Mixer { get; private set; }
+
+		public HdPsXxxAnalogAuxMixerController(string parent, uint mixer, HdPsXxx chassis)
+		{
+			Key = string.Format("{0}-analogMixer{1}", parent, mixer);
+
+			Mixer = chassis.AnalogAuxiliaryMixer[mixer];
+
+			Mixer.AuxMixerPropertyChange += OnAuxMixerPropertyChange;
+
+			VolumeLevelFeedback = new IntFeedback(VolumeFeedbackFunc);
+			MuteFeedback = new BoolFeedback(MuteFeedbackFunc);
+		}
+
+		private void OnAuxMixerPropertyChange(object sender, GenericEventArgs args)
+		{
+			Debug.Console(2, this, "AuxMixerPropertyChange: {0} > Index-{1}, EventId-{2}", sender.ToString(), args.Index, args.EventId);
+		}
+
+		#region Volume
+
+		public IntFeedback VolumeLevelFeedback { get; private set; }
+
+		protected Func<int> VolumeFeedbackFunc
+		{
+			get { return () => Mixer.VolumeFeedback.UShortValue; }
+		}
+
+		public void SetVolume(ushort level)
+		{
+			Mixer.Volume.UShortValue = level;
+		}
+
+		public void VolumeUp(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				var remainingRatio = (65535 - Mixer.Volume.UShortValue)/65535;
+				Mixer.Volume.CreateRamp(65535, 400);
+			}
+			else
+			{
+				Mixer.Volume.StopRamp();
+			}
+		}
+
+		public void VolumeDown(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				var remainingRatio = Mixer.Volume.UShortValue/65535;
+				Mixer.Volume.CreateRamp(0, (uint)(400 * remainingRatio));
+			}
+			else
+			{
+				Mixer.Volume.StopRamp();
+			}
+		}
+
+		#endregion
+
+
+		#region Mute
+
+		private bool _isMuted;
+
+		public BoolFeedback MuteFeedback { get; private set; }
+
+		protected Func<bool> MuteFeedbackFunc
+		{
+			get { return () => _isMuted = Mixer.AuxiliaryMuteControl.MuteOnFeedback.BoolValue; }
+		}
+
+		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,17 @@ namespace PepperDash_Essentials_DM.Chassis
 
 			OutputNames = props.Outputs;
 			SetupOutputs(OutputNames);
+
+			foreach (var item in _chassis.HdmiDmLiteOutputs)
+			{
+				var audioDevice = new HdPsXxxOutputAudioController(Key, item.Number, _chassis);
+				DeviceManager.AddDevice(audioDevice);
+			}
+			foreach (var item in _chassis.AnalogAuxiliaryMixer)
+			{
+				var audioDevice = new HdPsXxxAnalogAuxMixerController(Key, item.MixerNumber, _chassis);				
+				DeviceManager.AddDevice(audioDevice);
+			}
 		}
 
 		// get input priorities
@@ -174,7 +185,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 +196,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 +205,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), 
@@ -204,6 +215,13 @@ namespace PepperDash_Essentials_DM.Chassis
 					() => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
 			}
 
+			Debug.Console(0, 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);
+			}
+
 			_chassis.DMOutputChange += _chassis_OutputChange;
 		}
 
@@ -224,7 +242,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 +431,8 @@ Selector: {4}
 			_chassis.AutoRouteOff();
 		}
 
+
+
 		#region Events
 
 
@@ -517,6 +537,7 @@ Selector: {4}
 		#endregion
 
 
+
 		#region Factory
 
 
@@ -524,7 +545,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 +592,7 @@ Selector: {4}
 		}
 
 
-		#endregion		
+		#endregion
 	}
 
 

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

@@ -0,0 +1,99 @@
+using System;
+using Crestron.SimplSharpPro.DM;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_DM.Chassis
+{
+	public class HdPsXxxOutputAudioController : IKeyed, 
+		IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback // || IBasicVolumeWithFeedback
+	{
+		public string Key { get; private set; }
+		
+		public HdPsXxxOutputPort Port { get; private set; }
+		
+		public HdPsXxxOutputAudioController(string parent, uint output, HdPsXxx chassis)
+		{
+			Key = string.Format("{0}-audioOut{1}", parent, output);
+			
+			Port = chassis.HdmiDmLiteOutputs[output].OutputPort;
+
+			VolumeLevelFeedback = new IntFeedback(VolumeFeedbackFunc);
+			MuteFeedback = new BoolFeedback(MuteFeedbackFunc);
+		}
+
+		#region Volume
+
+		public IntFeedback VolumeLevelFeedback { get; private set; }
+
+		protected Func<int> VolumeFeedbackFunc
+		{
+			get { return () => Port.AudioOutput.VolumeFeedback.UShortValue; }
+		}
+
+		public void SetVolume(ushort level)
+		{
+			Port.AudioOutput.Volume.UShortValue = level;
+		}
+
+		public void VolumeUp(bool pressRelease)
+		{
+			if (pressRelease)
+			{
+				var remainingRatio = (65535 - Port.AudioOutput.Volume.UShortValue)/65535;
+				Port.AudioOutput.Volume.CreateRamp(65535, 400);
+			}
+			else
+			{
+				Port.AudioOutput.Volume.StopRamp();
+			}
+		}
+
+		public void VolumeDown(bool pressRelease)
+		{
+			if (pressRelease)
+			{				
+				var remainingRatio = Port.AudioOutput.Volume.UShortValue/65535;
+				Port.AudioOutput.Volume.CreateRamp(0, (uint)(400 * remainingRatio));
+			}
+			else
+			{
+				Port.AudioOutput.Volume.StopRamp();
+			}
+		}
+
+		#endregion
+
+
+		#region Mute
+
+		private bool _isMuted;
+
+		public BoolFeedback MuteFeedback { get; private set; }
+
+		protected Func<bool> MuteFeedbackFunc
+		{			
+			get { return () => _isMuted = Port.MuteOnFeedback.BoolValue; }
+		}
+
+		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" />