refactor(wip): MPC3 class refactor constructor

WIP: added support for HD-PS401, HD-PS402, HD-PS621 and HD-PS622,
pending testing with device.

.gitignore

@@ -389,3 +389,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
+.DS_Store

PepperDashEssentials/ControlSystem.cs

@@ -392,10 +392,8 @@ namespace PepperDash.Essentials
                         {
                             Debug.Console(2, "Adding DmpsRoutingController for {0} to Device Manager.", this.ControllerPrompt);
 
-                            var propertiesConfig = JsonConvert.DeserializeObject<DM.Config.DmpsRoutingPropertiesConfig>(devConf.Properties.ToString());
+                            var propertiesConfig = JsonConvert.DeserializeObject<DM.Config.DmpsRoutingPropertiesConfig>(devConf.Properties.ToString()) ??
-
+                                                   new DM.Config.DmpsRoutingPropertiesConfig();
-                            if(propertiesConfig == null)
-                                propertiesConfig =  new DM.Config.DmpsRoutingPropertiesConfig();
 
 	                        DeviceManager.AddDevice(DmpsRoutingController.GetDmpsRoutingController("processor-avRouting", this.ControllerPrompt, propertiesConfig));
                         }
@@ -404,38 +402,35 @@ namespace PepperDash.Essentials
                             Debug.Console(2, "MPC3 processor type detected.  Adding Mpc3TouchpanelController.");
 
                             var butToken = devConf.Properties["buttons"];
-                            if (butToken != null)
+	                        if (butToken == null)
 	                        {
-                                var buttons = butToken.ToObject<Dictionary<string, Essentials.Core.Touchpanels.KeypadButton>>();
+		                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                                var tpController = new Essentials.Core.Touchpanels.Mpc3TouchpanelController(devConf.Key, devConf.Name, Global.ControlSystem, buttons);
+			                        "Error: Unable to deserialize buttons collection for device: {0}", devConf.Key);
-                                DeviceManager.AddDevice(tpController);
+								continue;
-                            }
-                            else
-                            {
-                                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Unable to deserialize buttons collection for device: {0}", devConf.Key);
 	                        }
 	                        
+	                        var buttons = butToken.ToObject<Dictionary<string, Essentials.Core.Touchpanels.KeypadButton>>();
+	                        var tpController = new Core.Touchpanels.Mpc3TouchpanelController(
+			                        string.Format("{0}-keypadButtons", devConf.Key), devConf.Name, Global.ControlSystem, buttons);
+
+	                        DeviceManager.AddDevice(tpController);	                        
                         }
                         else
                         {
                             Debug.Console(2, "************Processor is not DMPS type***************");
                         }
 
-                        
-
                         continue;
                     }
 
                     // Try local factories first
-                    IKeyed newDev = null;
+                    var newDev = null ?? PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
 
 	                if (newDev == null)
-                        newDev = PepperDash.Essentials.Core.DeviceFactory.GetDevice(devConf);
+		                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Cannot load unknown device type '{0}', key '{1}'.",
-
+			                devConf.Type, devConf.Key);
-					if (newDev != null)
-						DeviceManager.AddDevice(newDev);
 	                else
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Cannot load unknown device type '{0}', key '{1}'.", devConf.Type, devConf.Key);
+		                DeviceManager.AddDevice(newDev);
                 }
                 catch (Exception e)
                 {
@@ -443,7 +438,6 @@ namespace PepperDash.Essentials
                 }
             }
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Devices Loaded.");
-
         }
 
 

PepperDashEssentials/PepperDashEssentials.csproj

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

PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs

@@ -226,7 +226,182 @@ namespace PepperDash.Essentials
             }
         }
 
-        void Initialize()
+        public override void Initialize()
+        {
+            try
+            {
+                //if (DefaultAudioDevice is IBasicVolumeControls)
+                //    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
+                //else if (DefaultAudioDevice is IHasVolumeDevice)
+                //    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
+                //CurrentVolumeControls = DefaultVolumeControls;
+
+
+                //// Combines call feedback from both codecs if available
+                //InCallFeedback = new BoolFeedback(() =>
+                //{
+                //    bool inAudioCall = false;
+                //    bool inVideoCall = false;
+
+                //    if (AudioCodec != null)
+                //        inAudioCall = AudioCodec.IsInCall;
+
+                //    if (VideoCodec != null)
+                //        inVideoCall = VideoCodec.IsInCall;
+
+                //    if (inAudioCall || inVideoCall)
+                //        return true;
+                //    else
+                //        return false;
+                //});
+
+                //SetupDisplays();
+
+                //// Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
+                //this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
+
+                //Debug.Console(2, this, "Microphone Privacy Config evaluated.");
+
+                //// Get emergency object, if any
+                //this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
+
+                //Debug.Console(2, this, "Emergency Config evaluated.");
+
+
+                //VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                //VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
+
+                //if (AudioCodec != null)
+                //    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+
+                //IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                //VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
+
+                //// link privacy to VC (for now?)
+                //PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
+                //VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+
+                //CallTypeFeedback = new IntFeedback(() => 0);
+
+                SetSourceListKey();
+
+                //EnablePowerOnToLastSource = true;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error Initializing Room: {0}", e);
+            }
+        }
+
+        private void SetupDisplays()
+        {
+            //DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
+
+            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
+
+            Displays.Clear();
+
+            foreach (var destination in destinationList)
+            {
+                var dest = destination.Value.SinkDevice as IRoutingSinkWithSwitching;
+
+                if (dest != null)
+                {
+                    Displays.Add(dest);
+                }
+
+                var display = dest as DisplayBase;
+                if (display != null)
+                {
+                    // Link power, warming, cooling to display
+                    var dispTwoWay = display as IHasPowerControlWithFeedback;
+                    if (dispTwoWay != null)
+                    {
+                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
+
+                        if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+                        {
+                            SetDefaultLevels();
+                        }
+                    }
+
+                    display.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
+                    display.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
+
+                    display.IsCoolingDownFeedback.OutputChange -= IsCoolingDownFeedback_OutputChange;
+                    display.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
+
+                }
+            }
+        }
+
+        void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsCoolingDownFeedback.FireUpdate();
+        }
+
+        void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsWarmingUpFeedback.FireUpdate();
+            if (!IsWarmingUpFeedback.BoolValue)
+                (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+        }
+
+        void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            var dispTwoWay = sender as IHasPowerControlWithFeedback;
+            
+            if (dispTwoWay != null && dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+            {
+                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                //    CurrentSourceInfo = null;
+                OnFeedback.FireUpdate();
+            }
+        }
+
+
+
+
+
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+            SetUpVideoCodec();
+        }
+
+        protected override void CustomSetConfig(DeviceConfig config)
+        {
+            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
+
+            if (newPropertiesConfig != null)
+                PropertiesConfig = newPropertiesConfig;
+
+            ConfigWriter.UpdateRoomConfig(config);
+        }
+
+        public override bool Deactivate()
+        {
+            // Stop listining to this event when room deactivated
+            VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
+
+            // Clear occupancy 
+            RoomOccupancy = null;
+
+            Debug.Console(0, this, "Room '{0}' Deactivated", Name);
+
+            return base.Deactivate();
+        }
+
+        public override bool CustomActivate()
         {
             try
             {
@@ -267,110 +442,37 @@ namespace PepperDash.Essentials
 
                 Debug.Console(2, this, "Emergency Config evaluated.");
 
-
-                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-                VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
-
                 if (AudioCodec != null)
-                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                {
+                    AudioCodec.CallStatusChange -= AudioCodec_CallStatusChange;
+                    AudioCodec.CallStatusChange += AudioCodec_CallStatusChange;
+                }
+
+                VideoCodec.CallStatusChange -= VideoCodec_CallStatusChange;
+                VideoCodec.CallStatusChange += VideoCodec_CallStatusChange;
+
+                VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
+                VideoCodec.IsReadyChange += VideoCodec_IsReadyChange;
+
+                VideoCodec.SharingContentIsOnFeedback.OutputChange -= SharingContentIsOnFeedback_OutputChange;
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
+
 
                 IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
                 // link privacy to VC (for now?)
                 PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error Initializing Room: {0}", e);
-            }
-        }
 
-        private void SetupDisplays()
-        {
-            //DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
 
-            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
-
-            foreach (var destination in destinationList)
-            {
-                var dest = destination.Value.SinkDevice as IRoutingSinkWithSwitching;
-
-                if (dest != null)
-                {
-                    Displays.Add(dest);
-                }
-
-                var display = dest as DisplayBase;
-                if (display != null)
-                {
-                    // Link power, warming, cooling to display
-                    var dispTwoWay = display as IHasPowerControlWithFeedback;
-                    if (dispTwoWay != null)
-                    {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
-                        {
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                            {
-                                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                //    CurrentSourceInfo = null;
-                                OnFeedback.FireUpdate();
-                            }
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                            {
-                                SetDefaultLevels();
-                            }
-                        };
-                    }
-
-                    display.IsWarmingUpFeedback.OutputChange += (o, a) =>
-                    {
-                        IsWarmingUpFeedback.FireUpdate();
-                        if (!IsWarmingUpFeedback.BoolValue)
-                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                    };
-                    display.IsCoolingDownFeedback.OutputChange += (o, a) =>
-                    {
-                        IsCoolingDownFeedback.FireUpdate();
-                    };
-
-                }
-            }
-        }
-
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
-            }
-
-            SetCodecExternalSources();
-        }
-
-        protected override void CustomSetConfig(DeviceConfig config)
-        {
-            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
-
-            if (newPropertiesConfig != null)
-                PropertiesConfig = newPropertiesConfig;
-
-            ConfigWriter.UpdateRoomConfig(config);
-        }
-
-        public override bool CustomActivate()
-        {
                 // Add Occupancy object from config
                 if (PropertiesConfig.Occupancy != null)
                 {
@@ -385,9 +487,50 @@ namespace PepperDash.Essentials
                 this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
                 this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error Activiating Room: {0}", e);
+            }
+
+
+            Debug.Console(0, this, "Room '{0}' Activated", Name);
             return base.CustomActivate();
         }
 
+        void AudioCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            InCallFeedback.FireUpdate();
+        }
+
+        void PrivacyModeIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            PrivacyModeIsOnFeedback.FireUpdate();
+        }
+
+        void VideoCodec_IsReadyChange(object sender, EventArgs e)
+        {
+            SetUpVideoCodec();
+        }
+
+        void SetUpVideoCodec()
+        {
+            SetCodecExternalSources();
+            SetCodecBranding();
+        }
+
+        void VideoCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            InCallFeedback.FireUpdate();
+        }
+
+        void SharingContentIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsSharingFeedback.FireUpdate();
+        }
+
+
+
         /// <summary>
         /// 
         /// </summary>
@@ -780,6 +923,8 @@ namespace PepperDash.Essentials
                         videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
                     }
                 }
+
+                Debug.Console(1, this, "Successfully set up codec external sources for room: {0}", Name);
             }
             catch (Exception e)
             {

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -19,6 +19,8 @@ namespace PepperDash.Essentials
 {
     public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IEssentialsHuddleVtc1Room
     {
+        private IEssentialsRoomCombiner _roomCombiner;
+
         private bool _codecExternalSourceChange;
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
@@ -234,7 +236,7 @@ namespace PepperDash.Essentials
                     throw new ArgumentNullException("DefaultAudioDevice cannot be null");
                 }
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -242,7 +244,64 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+
+        private void SetupEnvironmentalControlDevices()
+        {
+            if (PropertiesConfig.Environment != null)
+            {
+                if (PropertiesConfig.Environment.Enabled)
+                {
+                    EnvironmentalControlDevices.Clear();
+
+                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
+                    {
+                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
+                        EnvironmentalControlDevices.Add(envDevice);
+                    }
+                }
+            }
+        }
+
+
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+            SetUpVideoCodec();
+        }
+
+        protected override void CustomSetConfig(DeviceConfig config)
+        {
+            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
+
+            if (newPropertiesConfig != null)
+                PropertiesConfig = newPropertiesConfig;
+
+            ConfigWriter.UpdateRoomConfig(config);
+        }
+
+        public override bool Deactivate()
+        {
+
+            // Stop listining to this event when room deactivated
+            VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
+
+            // Clear occupancy 
+            RoomOccupancy = null;
+
+            Debug.Console(0, this, "Room '{0}' Deactivated", Name);
+
+            return base.Deactivate();
+        }
+
+        public override bool CustomActivate()
         {
             try
             {
@@ -278,32 +337,15 @@ namespace PepperDash.Essentials
                     var dispTwoWay = disp as IHasPowerControlWithFeedback;
                     if (dispTwoWay != null)
                     {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
+                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
-                            {
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange; 
-                                if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                                {
-                                    if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                        CurrentSourceInfo = null;
-                                    OnFeedback.FireUpdate();
-                                }
-                                if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                {
-                                    SetDefaultLevels();
-                                }
-                            };
                     }
 
-                    disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                    disp.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
-                    {
+                    disp.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-                        IsWarmingUpFeedback.FireUpdate();
-                        if (!IsWarmingUpFeedback.BoolValue)
-                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                    };
-                    disp.IsCoolingDownFeedback.OutputChange += (o, a) =>
-                    {
-                        IsCoolingDownFeedback.FireUpdate();
-                    };
 
+                    disp.IsCoolingDownFeedback.OutputChange -= IsCoolingDownFeedback_OutputChange;
+                    disp.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
                 }
 
 
@@ -318,19 +360,29 @@ namespace PepperDash.Essentials
 
                 Debug.Console(2, this, "Emergency Config evaluated.");
                 
-
-                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-				VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); }; 
-
                 if (AudioCodec != null)
-                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                {
+                    AudioCodec.CallStatusChange -= AudioCodec_CallStatusChange;
+                    AudioCodec.CallStatusChange += AudioCodec_CallStatusChange;
+                }
+
+                VideoCodec.CallStatusChange -= VideoCodec_CallStatusChange;
+                VideoCodec.CallStatusChange += VideoCodec_CallStatusChange;
+
+                VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
+                VideoCodec.IsReadyChange += VideoCodec_IsReadyChange;
+
+                VideoCodec.SharingContentIsOnFeedback.OutputChange -= SharingContentIsOnFeedback_OutputChange;
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
+
 
                 IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
                 // link privacy to VC (for now?)
                 PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
@@ -339,55 +391,8 @@ namespace PepperDash.Essentials
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error Initializing Room: {0}", e);
-            }
-   		}
-
-        private void SetupEnvironmentalControlDevices()
-        {
-            if (PropertiesConfig.Environment != null)
-            {
-                if (PropertiesConfig.Environment.Enabled)
-                {
-                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
-                    {
-                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
-                        EnvironmentalControlDevices.Add(envDevice);
-                    }
-                }
-            }
-        }
 
 
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
-            }
-
-			SetCodecExternalSources();
-        }
-
-        protected override void CustomSetConfig(DeviceConfig config)
-        {
-            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
-
-            if (newPropertiesConfig != null)
-                PropertiesConfig = newPropertiesConfig;
-
-            ConfigWriter.UpdateRoomConfig(config);
-        }
-
-        public override bool CustomActivate()
-        {
                 // Add Occupancy object from config
                 if (PropertiesConfig.Occupancy != null)
                 {
@@ -401,10 +406,77 @@ namespace PepperDash.Essentials
 
                 this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
                 this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error Activiating Room: {0}", e);
+            }
 
+            Debug.Console(0, this, "Room '{0}' Activated", Name);
             return base.CustomActivate();
         }
 
+        void PrivacyModeIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            PrivacyModeIsOnFeedback.FireUpdate();
+        }
+
+        void SharingContentIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsSharingFeedback.FireUpdate();
+        }
+
+        void AudioCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            InCallFeedback.FireUpdate();
+        }
+
+        void VideoCodec_IsReadyChange(object sender, EventArgs e)
+        {
+            SetUpVideoCodec();
+        }
+
+        void SetUpVideoCodec()
+        {
+            SetCodecExternalSources();
+            SetCodecBranding();
+        }
+
+        void VideoCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            InCallFeedback.FireUpdate();
+        }
+
+        void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsCoolingDownFeedback.FireUpdate();
+        }
+
+        void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsWarmingUpFeedback.FireUpdate();
+            if (!IsWarmingUpFeedback.BoolValue)
+                (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+        
+        }
+
+        void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            var dispTwoWay = DefaultDisplay as IHasPowerControlWithFeedback;
+
+            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+            {
+                if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                    CurrentSourceInfo = null;
+                OnFeedback.FireUpdate();
+            }
+            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+            {
+                SetDefaultLevels();
+            }
+            
+        }
+
         
 
         /// <summary>
@@ -832,6 +904,8 @@ namespace PepperDash.Essentials
                         videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
                     }
                 }
+                Debug.Console(1, this, "Successfully set up codec external sources for room: {0}", Name);
+
             }
             catch (Exception e)
             {

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

@@ -8,6 +8,18 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        [JoinName("VideoMuteOn")]
+        public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VideoMuteOff")]
+        public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VideoMuteToggle")]
+        public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
         [JoinName("CurrentOutputResolution")]
         public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });

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

@@ -0,0 +1,190 @@
+using System;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_Core.Bridges
+{
+	public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
+	{
+
+		#region Digital
+
+		[JoinName("EnableAutoRoute")]
+		public JoinDataComplete EnableAutoRoute = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 1,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Enable Automatic Routing on Xx1 Switchers",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+
+		[JoinName("InputSync")]
+		public JoinDataComplete InputSync = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 2,
+				JoinSpan = 8
+			},
+			new JoinMetadata
+			{
+				Description = "Device Input Sync",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+
+		[JoinName("EnableInputHdcp")]
+		public JoinDataComplete EnableInputHdcp = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 8
+			},
+			new JoinMetadata
+			{
+				Description = "Device Enable Input Hdcp",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+
+		[JoinName("DisableInputHdcp")]
+		public JoinDataComplete DisableInputHdcp = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 21,
+				JoinSpan = 8
+			},
+			new JoinMetadata
+			{
+				Description = "Device Disnable Input Hdcp",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+
+		[JoinName("IsOnline")]
+		public JoinDataComplete IsOnline = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 30,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Device Onlne",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Digital
+			});
+
+		#endregion
+
+
+		#region Analog
+
+		[JoinName("OutputRoute")]
+		public JoinDataComplete OutputRoute = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 2
+			},
+			new JoinMetadata
+			{
+				Description = "Device Output Route Set/Get",
+				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+				JoinType = eJoinType.Analog
+			});
+
+		#endregion
+
+
+		#region Serial
+
+		[JoinName("Name")]
+		public JoinDataComplete Name = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 1,
+				JoinSpan = 1
+			},
+			new JoinMetadata
+			{
+				Description = "Device Name",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Serial
+			});
+
+
+		[JoinName("InputName")]
+		public JoinDataComplete InputName = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 2,
+				JoinSpan = 8
+			},
+			new JoinMetadata
+			{
+				Description = "Device Input Name",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Serial
+			});
+
+
+		[JoinName("OutputName")]
+		public JoinDataComplete OutputName = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 11,
+				JoinSpan = 2
+			},
+			new JoinMetadata
+			{
+				Description = "Device Output Name",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Serial
+			});
+
+
+		[JoinName("OutputRoutedName")]
+		public JoinDataComplete OutputRoutedName = new JoinDataComplete(
+			new JoinData
+			{
+				JoinNumber = 16,
+				JoinSpan = 2
+			},
+			new JoinMetadata
+			{
+				Description = "Device Output Route Name",
+				JoinCapabilities = eJoinCapabilities.ToSIMPL,
+				JoinType = eJoinType.Serial
+			});
+
+
+		#endregion
+
+		/// <summary>
+		/// Constructor to use when instantiating this join map without inheriting from it
+		/// </summary>
+		/// <param name="joinStart">Join this join map will start at</param>
+		public HdPsXxxControllerJoinMap(uint joinStart)
+			: this(joinStart, typeof(HdPsXxxControllerJoinMap))
+		{
+		}
+
+		/// <summary>
+		/// Constructor to use when extending this Join map
+		/// </summary>
+		/// <param name="joinStart">Join this join map will start at</param>
+		/// <param name="type">Type of the child join map</param>
+		protected HdPsXxxControllerJoinMap(uint joinStart, Type type)
+			: base(joinStart, type)
+		{
+		}
+	}
+}

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

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("Online")]
         public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("OutletCount")]
         public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },

essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs

@@ -356,16 +356,18 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var customJoinData in joinData)
             {
-                var join = Joins[customJoinData.Key];
+                JoinDataComplete join;
+
+                if (!Joins.TryGetValue(customJoinData.Key, out join))
+                {
+                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
+                    continue;
+                }
 
                 if (join != null)
                 {
                     join.SetCustomJoinData(customJoinData.Value);
                 }
-                else
-                {
-                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
-                }
             }
 
             PrintJoinMapInfo();

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -85,19 +85,33 @@ namespace PepperDash.Essentials.Core
 	    {
 	        if (_partitionSensor.IsOnline == false) return;
 
+            // Default to enable
+            _partitionSensor.Enable.BoolValue = true;
+
 	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");
 
             if (PropertiesConfig.Sensitivity != null)
             {
                 Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
                     PropertiesConfig.Sensitivity);
-                _partitionSensor.Sensitivity.UShortValue = (ushort) PropertiesConfig.Sensitivity;
+                _partitionSensor.Sensitivity.UShortValue = (ushort)PropertiesConfig.Sensitivity;
             }
             else
             {
                 Debug.Console(1, this, "Sensitivity null, no value specified in config");
             }
 
+            if (PropertiesConfig.Enable != null)
+            {
+                Debug.Console(1, this, "Enable found, attempting to set value '{0}' from config",
+                    PropertiesConfig.Enable);
+                _partitionSensor.Enable.BoolValue = (bool)PropertiesConfig.Enable;
+            }
+            else
+            {
+                Debug.Console(1, this, "Enable null, no value specified in config");
+            }
+
 	    }
 
 	    private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorPropertiesConfig.cs

@@ -17,5 +17,8 @@ namespace PepperDash_Essentials_Core.PartitionSensor
         /// </remarks>
         [JsonProperty("sensitivity")]
         public ushort? Sensitivity { get; set; }
+
+        [JsonProperty("enable")]
+        public bool? Enable { get; set; }
     }
 }

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

@@ -83,7 +83,7 @@
       <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
@@ -127,6 +127,7 @@
     <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\HdPsXxxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs

@@ -35,7 +35,7 @@ namespace PepperDash.Essentials.Core
         public BoolFeedback IsWarmingUpFeedback { get; private set; }
         public BoolFeedback IsCoolingDownFeedback { get; private set; }
 
-        public IOccupancyStatusProvider RoomOccupancy { get; private set; }
+        public IOccupancyStatusProvider RoomOccupancy { get; protected set; }
 
         public bool OccupancyStatusProviderIsRemote { get; private set; }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs

@@ -1,12 +1,8 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Globalization;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-
+using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Core.Touchpanels
 {
@@ -16,82 +12,147 @@ namespace PepperDash.Essentials.Core.Touchpanels
     /// </summary>
     public class Mpc3TouchpanelController : Device
     {
-        MPC3Basic _Touchpanel;
+	    readonly MPC3Basic _touchpanel;
 
-        Dictionary<string, KeypadButton> _Buttons;
+	    readonly Dictionary<string, KeypadButton> _buttons;
 
         public Mpc3TouchpanelController(string key, string name, CrestronControlSystem processor, Dictionary<string, KeypadButton> buttons)
             : base(key, name)
         {
-            _Touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
+            _touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
-            _Buttons = buttons;
+	        if (_touchpanel == null)
+	        {
+				Debug.Console(1, this, "Failed to construct {0}, check configuration", key);
+		        return;
+	        }
 			
-            _Touchpanel.ButtonStateChange += new Crestron.SimplSharpPro.DeviceSupport.ButtonEventHandler(_Touchpanel_ButtonStateChange);
+			_touchpanel.ButtonStateChange += _touchpanel_ButtonStateChange;
+			_buttons = buttons;
 
 	        AddPostActivationAction(() =>
 	        {
 		        // Link up the button feedbacks to the specified BoolFeedbacks
-                    foreach (var button in _Buttons)
+		        foreach (var button in _buttons)
 		        {
-                        var feedbackConfig = button.Value.Feedback;
+					var buttonKey = button.Key.ToLower();
-                        var device = DeviceManager.GetDeviceForKey(feedbackConfig.DeviceKey) as Device;
+					var buttonConfig = button.Value;
-                        if (device != null)
+					if (buttonConfig == null)
 			        {
-                            var bKey = button.Key.ToLower();
+						Debug.Console(1, this, "Unable to get button config for {0}-{1}", Key, button.Key);
-
-                            var feedback = device.GetFeedbackProperty(feedbackConfig.FeedbackName);
-
-                            var bFeedback = feedback as BoolFeedback;
-                            var iFeedback = feedback as IntFeedback;
-                            if (bFeedback != null)
-                            {
-
-                                if (bKey == "power")
-                                {
-                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackPower);
-                                    continue;
-                                }
-                                else if (bKey == "mute")
-                                {
-                                    bFeedback.LinkCrestronFeedback(_Touchpanel.FeedbackMute);
 						continue;
 			        }
 
-                                // Link to the Crestron Feedback corresponding to the button number
+					int buttonNumber;
-                                bFeedback.LinkCrestronFeedback(_Touchpanel.Feedbacks[UInt16.Parse(button.Key)]);
+					if (TryParseInt(buttonKey, out buttonNumber))
-                            }
-                            else if (iFeedback != null)
 					{
-                                if (bKey == "volumefeedback")
+						Debug.Console(0, this, "buttonFeedback: tryIntParse successful, buttonNumber = {0}", buttonNumber);
-                                {
+						_touchpanel.EnableNumericalButton((uint)buttonNumber);						
-                                    var volFeedback = feedback as IntFeedback;
-                                    // TODO: Figure out how to subsribe to a volume IntFeedback and link it to the voluem
-                                    volFeedback.LinkInputSig(_Touchpanel.VolumeBargraph);
-                                }
 					}
 					else
 					{
-                                Debug.Console(1, this, "Unable to get BoolFeedback with name: {0} from device: {1}", feedbackConfig.FeedbackName, device.Key);
+						Debug.Console(0, this, "buttonFeedback: tryIntParse failed, buttonKey = {0}", buttonKey);
 					}
-                        }
+
-                        else
+			        //var buttonEventTypes = buttonConfig.EventTypes;
+
+			        var buttonFeedback = buttonConfig.Feedback;
+			        if (buttonFeedback == null)
 			        {
-                            Debug.Console(1, this, "Unable to get device with key: {0}", feedbackConfig.DeviceKey);
+				        Debug.Console(1, this, "Button '{0}' feedback not configured, feedback will not be implemented", buttonKey);
+				        continue;
+			        }
+			        
+					var device = DeviceManager.GetDeviceForKey(buttonFeedback.DeviceKey) as Device;
+			        if (device == null)
+			        {
+				        Debug.Console(1, this, "Unable to get device with key {0}, feedback will not be implemented",
+					        buttonFeedback.DeviceKey);
+						continue;				       
+			        }
+
+					var deviceFeedback = device.GetFeedbackProperty(buttonFeedback.FeedbackName);
+					Debug.Console(0, this, "deviceFeedback.GetType().Name: {0}", deviceFeedback.GetType().Name);
+					//switch (feedback.GetType().Name.ToLower())
+					//{
+					//    case("boolfeedback"):
+					//    {
+
+					//        break;
+					//    }
+					//    case("intfeedback"):
+					//    {
+
+					//        break;
+					//    }
+					//}
+
+					var boolFeedback = deviceFeedback as BoolFeedback;
+					var intFeedback = deviceFeedback as IntFeedback;
+
+					switch (buttonKey)
+					{
+						case ("power"):
+							{
+								if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.FeedbackPower);
+								break;
+							}
+						case ("volumeup"):
+							{
+								break;
+							}
+						case ("volumedown"):
+							{
+								break;
+							}
+						case ("volumefeedback"):
+							{
+								if (intFeedback != null)
+								{
+									var volumeFeedback = intFeedback;
+									volumeFeedback.LinkInputSig(_touchpanel.VolumeBargraph);
+								}
+								break;
+							}
+						case ("mute"):
+							{
+								if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.FeedbackMute);
+								break;
+							}
+						default:
+							{
+								if (boolFeedback != null) boolFeedback.LinkCrestronFeedback(_touchpanel.Feedbacks[(uint)buttonNumber]);
+								break;
+							}
 					}					
 		        }
 	        });
         }
 
-        void _Touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
+	    public bool TryParseInt(string str, out int result)
+	    {
+		    result = 0;
+
+		    foreach (var c in str)
+		    {
+			    if(c < '0' || c > '9')
+					return false;
+
+			    result = result*10 + (c - '0');
+		    }
+
+		    return true;
+	    }
+
+        void _touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args)
         {
             Debug.Console(1, this, "Button {0} ({1}), {2}", args.Button.Number, args.Button.Name, args.NewButtonState);
             var type = args.NewButtonState.ToString();
 
-            if (_Buttons.ContainsKey(args.Button.Number.ToString()))
+            if (_buttons.ContainsKey(args.Button.Number.ToString(CultureInfo.InvariantCulture)))
             {
-                Press(args.Button.Number.ToString(), type);
+                Press(args.Button.Number.ToString(CultureInfo.InvariantCulture), type);
             }
-            else if(_Buttons.ContainsKey(args.Button.Name.ToString()))
+            else if(_buttons.ContainsKey(args.Button.Name.ToString()))
             {
                 Press(args.Button.Name.ToString(), type);
             }
@@ -101,29 +162,30 @@ namespace PepperDash.Essentials.Core.Touchpanels
         /// Runs the function associated with this button/type. One of the following strings:
         /// Pressed, Released, Tapped, DoubleTapped, Held, HeldReleased    
         /// </summary>
-        /// <param name="number"></param>
+        /// <param name="buttonKey"></param>
         /// <param name="type"></param>
-        public void Press(string number, string type)
+        public void Press(string buttonKey, string type)
         {
             // TODO: In future, consider modifying this to generate actions at device activation time
             //       to prevent the need to dynamically call the method via reflection on each button press
-            if (!_Buttons.ContainsKey(number)) { return; }
+	        if (!_buttons.ContainsKey(buttonKey)) return;
-            var but = _Buttons[number];
-            if (but.EventTypes.ContainsKey(type))
-            {
-                foreach (var a in but.EventTypes[type]) { DeviceJsonApi.DoDeviceAction(a); }
-            }
-        }
 
+	        var button = _buttons[buttonKey];
+	        if (!button.EventTypes.ContainsKey(type)) return;
 
+	        foreach (var eventType in button.EventTypes[type]) DeviceJsonApi.DoDeviceAction(eventType);
+        }
     }
 
     /// <summary>
-    /// Represents the configuration of a keybad buggon
+    /// Represents the configuration of a keypad button
     /// </summary>
     public class KeypadButton
     {
+		[JsonProperty("eventTypes")]
         public Dictionary<string, DeviceActionWrapper[]> EventTypes { get; set; }
+
+		[JsonProperty("feedback")]
         public KeypadButtonFeedback Feedback { get; set; }
 
         public KeypadButton()
@@ -134,11 +196,14 @@ namespace PepperDash.Essentials.Core.Touchpanels
     }
 
 	/// <summary>
-    /// 
+	/// Represents the configuration of a keypad button feedback
 	/// </summary>
 	public class KeypadButtonFeedback
 	{
+		[JsonProperty("deviceKey")]
 		public string DeviceKey { get; set; }
+
+		[JsonProperty("feedbackName")]
 		public string FeedbackName { get; set; }
 	}
 }

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

@@ -129,7 +129,7 @@ namespace PepperDash.Essentials.DM.AirMedia
             else
                 AirMedia.DisplayControl.DisableAutomaticRouting();
 
-            return true;
+            return base.CustomActivate();
         }
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)

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

@@ -0,0 +1,657 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+using PepperDash_Essentials_Core.Bridges;
+using PepperDash_Essentials_DM.Config;
+
+namespace PepperDash_Essentials_DM.Chassis
+{
+	[Description("Wrapper class for all HdPsXxx switchers")]
+	public class HdPsXxxController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, IHasFeedback
+	{
+
+		private readonly HdPsXxx _chassis;
+		private readonly HdPs401 _chassis401;
+		private readonly HdPs621 _chassis621;
+
+		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+		public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+
+		public Dictionary<uint, string> InputNames { get; set; }
+		public Dictionary<uint, string> OutputNames { get; set; }
+
+		public FeedbackCollection<StringFeedback> InputNameFeedbacks { get; private set; }
+		public FeedbackCollection<BoolFeedback> InputHdcpEnableFeedback { get; private set; }
+
+		public FeedbackCollection<StringFeedback> OutputNameFeedbacks { get; private set; }
+		public FeedbackCollection<StringFeedback> OutputRouteNameFeedback { get; private set; }
+
+		public FeedbackCollection<BoolFeedback> VideoInputSyncFeedbacks { get; private set; }
+		public FeedbackCollection<IntFeedback> VideoOutputRouteFeedbacks { get; private set; }
+
+		public StringFeedback DeviceNameFeedback { get; private set; }
+		public BoolFeedback AutoRouteFeedback { get; private set; }
+
+		public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="key"></param>
+		/// <param name="name"></param>
+		/// <param name="chassis">HdPs401 device instance</param>
+		/// <param name="props"></param>
+		public HdPsXxxController(string key, string name, HdPsXxx chassis, HdPsXxxPropertiesConfig props)
+			: base(key, name, chassis)
+		{
+			_chassis = chassis;
+			Name = name;
+
+			if (props == null)
+			{
+				Debug.Console(1, this, "HdPsXxxController properties are null, failed to build device");
+				return;
+			}
+
+			InputPorts = new RoutingPortCollection<RoutingInputPort>();			
+			InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
+			InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
+			InputNames = new Dictionary<uint, string>();
+			//InputNames = props.Inputs;
+
+			OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
+			OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
+			OutputRouteNameFeedback = new FeedbackCollection<StringFeedback>();
+			OutputNames = new Dictionary<uint, string>();
+			//OutputNames = props.Outputs;
+
+			VideoInputSyncFeedbacks = new FeedbackCollection<BoolFeedback>();
+			VideoOutputRouteFeedbacks = new FeedbackCollection<IntFeedback>();
+
+			if (_chassis.NumberOfOutputs == 1)
+			{
+				if (_chassis is HdPs401)
+					_chassis401 = _chassis as HdPs401;
+				if (_chassis is HdPs621)
+					_chassis621 = _chassis as HdPs621;
+
+				AutoRouteFeedback = new BoolFeedback(() => _chassis401.PriorityRouteOnFeedback.BoolValue);
+			}
+
+			SetupInputs(props.Inputs);
+			SetupOutputs(props.Outputs);
+
+			AddPostActivationAction(AddFeedbackCollecitons);
+		}
+
+		// input setup
+		private void SetupInputs(Dictionary<uint, string> dict)
+		{
+			if (dict == null)
+			{
+				Debug.Console(1, this, "Failed to setup inputs, properties are null");
+				return;
+			}
+			foreach (var kvp in dict)
+			{
+				Debug.Console(1, this, "props.Input[{0}]: {1}", kvp.Key, kvp.Value);
+			}
+			InputNames = dict;
+
+			for (uint i = 1; i <= _chassis.NumberOfInputs; i++)
+			{
+				var index = i;
+				var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("Input {0}", index) : InputNames[index];
+				var input = _chassis.Inputs[index];
+				var hdmiInput = _chassis.HdmiInputs[index];
+				var dmLiteInput = _chassis.DmLiteInputs[index];
+
+				InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index]));
+
+				// TODO [ ] verify which input type is needed
+				input.Name.StringValue = name;
+				hdmiInput.Name.StringValue = name;
+				dmLiteInput.Name.StringValue = name;
+
+				var port = new RoutingInputPort(name, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
+				{
+					FeedbackMatchObject = input
+				};
+				InputPorts.Add(port);
+
+				InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => hdmiInput.InputPort.HdcpSupportOnFeedback.BoolValue));
+
+				VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue));
+			}
+
+			_chassis.DMInputChange += _chassis_InputChange;			
+		}
+
+		// output setup
+		private void SetupOutputs(Dictionary<uint, string> dict)
+		{
+			if (dict == null)
+			{
+				Debug.Console(1, this, "Failed to setup outputs, properties are null");
+				return;
+			}
+			foreach (var kvp in dict)
+			{
+				Debug.Console(1, this, "props.Output[{0}]: {1}", kvp.Key, kvp.Value);
+			}
+			OutputNames = dict;
+
+			for (uint i = 1; i <= _chassis.NumberOfOutputs; i++)
+			{
+				var index = i;
+				var name = string.IsNullOrEmpty(OutputNames[index]) ? string.Format("Output {0}", index) : OutputNames[index];
+				var output = _chassis.Outputs[index];
+				var hdmiDmLiteOutput = _chassis.HdmiDmLiteOutputs[index];
+
+				OutputNameFeedbacks.Add(new StringFeedback(name, () => OutputNames[index]));
+
+				// TODO [ ] verify which output type is needed
+				output.Name.StringValue = name;
+				hdmiDmLiteOutput.Name.StringValue = name;
+
+				var port = new RoutingOutputPort(name, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, output, this)
+				{
+					FeedbackMatchObject = output
+				};
+				OutputPorts.Add(port);
+
+				OutputRouteNameFeedback.Add(new StringFeedback(name, () => output.VideoOutFeedback.NameFeedback.StringValue));
+
+				VideoOutputRouteFeedbacks.Add(new IntFeedback(name, () => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
+			}
+
+			_chassis.DMOutputChange += _chassis_OutputChange;
+		}
+
+
+		#region BridgeLinking
+
+		/// <summary>
+		/// Link device to API
+		/// </summary>
+		/// <param name="trilist"></param>
+		/// <param name="joinStart"></param>
+		/// <param name="joinMapKey"></param>
+		/// <param name="bridge"></param>
+		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+		{
+			var joinMap = new HdPsXxxControllerJoinMap(joinStart);
+
+			if (bridge != null)
+			{
+				bridge.AddJoinMap(Key, joinMap);
+			}
+			else
+			{
+				Debug.Console(0, this, "Please update config to use 'eiscApiAdvanced' to get all join map features for this device");
+			}
+
+			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+			DeviceNameFeedback.LinkInputSig(trilist.StringInput[joinMap.Name.JoinNumber]);
+
+			_chassis.OnlineStatusChange += _chassis_OnlineStatusChange;
+
+			if (_chassis401 != null) LinkChassis401ToApi(trilist, joinMap);
+
+			if (_chassis621 != null) LinkChassis621ToApi(trilist, joinMap);
+
+			LinkChassisInputsToApi(trilist, joinMap);
+			LinkChassisOutputsToApi(trilist, joinMap);
+
+			trilist.OnlineStatusChange += (sender, args) =>
+			{
+				if (!args.DeviceOnLine) return;
+			};
+		}
+
+
+		// links inputs to API
+		private void LinkChassisInputsToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
+		{
+			for (uint i = 1; i <= _chassis.NumberOfInputs; i++)
+			{
+				var input = i;
+				var inputName = InputNames[input];
+				var indexWithOffset = input - 1;
+
+				trilist.SetSigTrueAction(joinMap.EnableInputHdcp.JoinNumber + indexWithOffset, () => EnableHdcp(input));
+				trilist.SetSigTrueAction(joinMap.DisableInputHdcp.JoinNumber + indexWithOffset, () => DisableHdcp(input));
+
+				InputHdcpEnableFeedback[inputName].LinkInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + indexWithOffset]);
+				InputHdcpEnableFeedback[inputName].LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableInputHdcp.JoinNumber + indexWithOffset]);
+
+				VideoInputSyncFeedbacks[inputName].LinkInputSig(trilist.BooleanInput[joinMap.InputSync.JoinNumber + indexWithOffset]);
+
+				InputNameFeedbacks[inputName].LinkInputSig(trilist.StringInput[joinMap.InputName.JoinNumber + indexWithOffset]);
+			}
+		}
+
+
+		// links outputs to API
+		private void LinkChassisOutputsToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
+		{
+			for (uint i = 1; i <= _chassis.NumberOfOutputs; i++)
+			{
+				var output = i;
+				var outputName = OutputNames[output];
+				var indexWithOffset = output - 1;
+
+				trilist.SetUShortSigAction(joinMap.OutputRoute.JoinNumber + indexWithOffset, (a) =>
+					ExecuteNumericSwitch(a, (ushort) output, eRoutingSignalType.AudioVideo));
+
+				OutputNameFeedbacks[outputName].LinkInputSig(trilist.StringInput[joinMap.OutputName.JoinNumber + indexWithOffset]);
+				OutputRouteNameFeedback[outputName].LinkInputSig(trilist.StringInput[joinMap.OutputRoutedName.JoinNumber + indexWithOffset]);
+
+				VideoOutputRouteFeedbacks[outputName].LinkInputSig(trilist.UShortInput[joinMap.OutputRoute.JoinNumber + indexWithOffset]);
+			}
+		}
+
+
+		// links HdPs401 chassis to API
+		private void LinkChassis401ToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
+		{
+			trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis401.AutoRouteOn());
+			trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis401.AutoRouteOff());
+
+			AutoRouteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
+		}
+
+
+		// links HdPs621 chassis to API
+		private void LinkChassis621ToApi(BasicTriList trilist, HdPsXxxControllerJoinMap joinMap)
+		{
+			trilist.SetSigTrueAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis621.AutoRouteOn());
+			trilist.SetSigFalseAction(joinMap.EnableAutoRoute.JoinNumber, () => _chassis621.AutoRouteOff());
+
+			AutoRouteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableAutoRoute.JoinNumber]);
+		}
+
+
+		#endregion
+
+
+		/// <summary>
+		/// Executes a device switch using objects
+		/// </summary>
+		/// <param name="inputSelector"></param>
+		/// <param name="outputSelector"></param>
+		/// <param name="signalType"></param>
+		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+		{
+			var input = inputSelector as HdPsXxxHdmiInput;
+			var output = outputSelector as HdPsXxxHdmiOutput;
+
+			Debug.Console(2, this, "ExecuteSwitch: input={0}, output={1}", input, output);
+
+			if (output == null)
+			{
+				Debug.Console(0, this, "Unable to make switch, output selector is not HdPsXxxHdmiOutput");
+				return;
+			}
+
+			// TODO [ ] Validate if sending the same input toggles the switch
+			var current = output.VideoOut;
+			if (current != input)
+				output.VideoOut = input;
+		}
+
+
+		/// <summary>
+		/// Executes a device switch using numeric values
+		/// </summary>
+		/// <param name="inputSelector"></param>
+		/// <param name="outputSelector"></param>
+		/// <param name="signalType"></param>
+		public void ExecuteNumericSwitch(ushort inputSelector, ushort outputSelector, eRoutingSignalType signalType)
+		{
+			var input = inputSelector == 0 ? null : _chassis.Inputs[inputSelector];
+			var output = _chassis.Outputs[outputSelector];
+
+			Debug.Console(2, this, "ExecuteNumericSwitch: input={0}, output={1}", input, output);
+
+			ExecuteSwitch(input, output, signalType);
+		}
+
+
+		/// <summary>
+		/// Enables Hdcp on the provided port
+		/// </summary>
+		/// <param name="port"></param>
+		public void EnableHdcp(uint port)
+		{
+			if (port <= 0 || port > _chassis.NumberOfInputs) return;
+
+			_chassis.HdmiInputs[port].InputPort.HdcpSupportOn();
+			InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
+		}
+
+
+		/// <summary>
+		/// Disables Hdcp on the provided port
+		/// </summary>
+		/// <param name="port"></param>
+		public void DisableHdcp(uint port)
+		{
+			if (port <= 0 || port > _chassis.NumberOfInputs) return;
+
+			_chassis.HdmiInputs[port].InputPort.HdcpSupportOff();
+			InputHdcpEnableFeedback[InputNames[port]].FireUpdate();
+		}
+
+
+		/// <summary>
+		/// Enables switcher auto route
+		/// </summary>
+		public void EnableAutoRoute()
+		{
+			if (_chassis.NumberOfInputs != 1) return;
+
+			if (_chassis401 != null)
+			{
+				_chassis401.AutoRouteOn();
+			}
+
+			if (_chassis621 != null)
+			{
+				_chassis621.AutoRouteOn();
+			}
+		}
+
+
+		/// <summary>
+		/// Disables switcher auto route
+		/// </summary>
+		public void DisableAutoRoute()
+		{
+			if (_chassis.NumberOfInputs != 1) return;
+
+			if (_chassis401 != null)
+			{
+				_chassis401.AutoRouteOff();
+			}
+
+			if (_chassis621 != null)
+			{
+				_chassis621.AutoRouteOff();
+			}
+		}
+
+		#region Events		
+
+
+		// _chassis online/offline event
+		private void _chassis_OnlineStatusChange(GenericBase currentDevice,
+			OnlineOfflineEventArgs args)
+		{
+			IsOnline.FireUpdate();
+
+			if (!args.DeviceOnLine) return;
+
+			foreach (var feedback in Feedbacks)
+			{
+				feedback.FireUpdate();
+			}
+		}
+
+
+		// _chassis input change event
+		private void _chassis_InputChange(Switch device, DMInputEventArgs args)
+		{
+			var eventId = args.EventId;
+
+			switch (eventId)
+			{
+				case DMInputEventIds.VideoDetectedEventId:
+				{
+					Debug.Console(1, this, "Event ID {0}: Updating VideoInputSyncFeedbacks", eventId);
+					foreach (var item in VideoInputSyncFeedbacks)
+					{
+						item.FireUpdate();
+					}
+					break;
+				}
+				case DMInputEventIds.InputNameFeedbackEventId:
+				case DMInputEventIds.InputNameEventId:
+				case DMInputEventIds.NameFeedbackEventId:
+				{
+					Debug.Console(1, this, "Event ID {0}: Updating name feedbacks", eventId);
+
+					var input = args.Number;
+					var name = _chassis.HdmiInputs[input].NameFeedback.StringValue;
+
+					Debug.Console(1, this, "Input {0} Name {1}", input, name);
+					break;
+				}
+				default:
+				{
+					Debug.Console(1, this, "Uhandled DM Input Event ID {0}", eventId);
+					break;
+				}
+			}
+		}
+
+
+		// _chassis output change event
+		private void _chassis_OutputChange(Switch device, DMOutputEventArgs args)
+		{
+			if (args.EventId != DMOutputEventIds.VideoOutEventId) return;
+
+			var output = args.Number;
+
+			var input = _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback == null
+				? 0
+				: _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback.Number;
+
+			var outputName = OutputNames[output];
+
+			var feedback = VideoOutputRouteFeedbacks[outputName];
+			if (feedback == null) return;
+
+			var inputPort = InputPorts.FirstOrDefault(
+				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output].VideoOutFeedback);
+
+			var outputPort = OutputPorts.FirstOrDefault(
+				p => p.FeedbackMatchObject == _chassis.HdmiDmLiteOutputs[output]);
+
+			feedback.FireUpdate();
+
+			OnSwitchChange(new RoutingNumericEventArgs(
+				output, input, outputPort, inputPort, eRoutingSignalType.AudioVideo));
+		}
+
+
+		/// <summary>
+		/// Raise an event when the status of a switch object changes.
+		/// </summary>
+		/// <param name="args">Argumetns defined as IKeyName sender, output, input, & eRoutingSignalType</param>
+		private void OnSwitchChange(RoutingNumericEventArgs args)
+		{
+			var newEvent = NumericSwitchChange;
+			if (newEvent != null) newEvent(this, args);
+		}
+
+
+		#endregion
+
+
+		#region FeedbacksAndFeedbackCollections
+
+
+		/// <summary>
+		/// Add feedback colleciton arrays to feedback collections 
+		/// </summary>
+		/// <param name="feedbackCollections">BoolFeedback[] arrays</param>
+		public void AddCollectionsToList(params FeedbackCollection<BoolFeedback>[] feedbackCollections)
+		{
+			foreach (var item in feedbackCollections.SelectMany(feedbackCollection => feedbackCollections))
+			{
+				AddCollectionsToList(item);
+			}
+		}
+
+
+		/// <summary>
+		/// Add feedback colleciton arrays to feedback collections 
+		/// </summary>
+		/// <param name="feedbackCollections">IntFeedback[] arrays</param>
+		public void AddCollectionsToList(params FeedbackCollection<IntFeedback>[] feedbackCollections)
+		{
+			foreach (var item in feedbackCollections.SelectMany(feedbackCollection => feedbackCollections))
+			{
+				AddCollectionsToList(item);
+			}
+		}
+
+
+		/// <summary>
+		/// Add feedback colleciton arrays to feedback collections 
+		/// </summary>
+		/// <param name="feedbackCollections">StringFeedback[] arrays</param>
+		public void AddCollectionsToList(params FeedbackCollection<StringFeedback>[] feedbackCollections)
+		{
+			foreach (var item in feedbackCollections.SelectMany(feedbackCollection => feedbackCollections))
+			{
+				AddCollectionsToList(item);
+			}
+		}
+
+
+		/// <summary>
+		/// Adds feedback colleciton to feedback collections
+		/// </summary>
+		/// <param name="feedbackCollection">BoolFeedback</param>
+		public void AddCollectionToList(FeedbackCollection<BoolFeedback> feedbackCollection)
+		{
+			foreach (var item in feedbackCollection.Where(item => item != null))
+			{
+				AddFeedbackToList(item);
+			}
+		}
+
+
+		/// <summary>
+		/// Adds feedback colleciton to feedback collections
+		/// </summary>
+		/// <param name="feedbackCollection">IntFeedback</param>
+		public void AddCollectionToList(FeedbackCollection<IntFeedback> feedbackCollection)
+		{
+			foreach (var item in feedbackCollection.Where(item => item != null))
+			{
+				AddFeedbackToList(item);
+			}
+		}
+
+
+		/// <summary>
+		/// Adds feedback colleciton to feedback collections
+		/// </summary>
+		/// <param name="feedbackCollection">StringFeedback</param>
+		public void AddCollectionToList(FeedbackCollection<StringFeedback> feedbackCollection)
+		{
+			foreach (var item in feedbackCollection.Where(item => item != null))
+			{
+				AddFeedbackToList(item);
+			}
+		}
+
+
+		/// <summary>
+		/// Adds individual feedbacks to feedback collection
+		/// </summary>
+		/// <param name="fb">Feedback</param>
+		public void AddFeedbackToList(PepperDash.Essentials.Core.Feedback fb)
+		{
+			if (fb == null || Feedbacks.Contains(fb)) return;
+
+			Feedbacks.Add(fb);
+		}
+
+
+		/// <summary>
+		/// Adds provided feedbacks to feedback collection list
+		/// </summary>
+		public void AddFeedbackCollecitons()
+		{
+			AddFeedbackToList(DeviceNameFeedback);
+			AddCollectionsToList(VideoInputSyncFeedbacks, InputHdcpEnableFeedback);
+			AddCollectionsToList(VideoOutputRouteFeedbacks);
+			AddCollectionsToList(InputNameFeedbacks, OutputNameFeedbacks, OutputRouteNameFeedback);
+		}
+
+
+		#endregion
+
+
+		#region Factory
+
+
+		public class HdSp401ControllerFactory : EssentialsDeviceFactory<HdPsXxxController>
+		{
+			public HdSp401ControllerFactory()
+			{
+				TypeNames = new List<string>() { "hdps401", "hdps402", "hdps621", "hdps622" };
+			}
+			public override EssentialsDevice BuildDevice(DeviceConfig dc)
+			{
+				Debug.Console(1, "Factory Attempting to create new HD-PSXxx device");
+
+				var props = JsonConvert.DeserializeObject<HdPsXxxPropertiesConfig>(dc.Properties.ToString());
+				if (props == null)
+				{
+					Debug.Console(1, "Factory failed to create new HD-PSXxx device, properties config was null");
+					return null;
+				}
+
+				var key = dc.Key;
+				var name = dc.Name;
+				var type = dc.Type.ToLower();
+				var control = props.Control;
+				var ipid = control.IpIdInt;
+				//var address = control.TcpSshProperties.Address;
+
+				switch (type)
+				{
+					case ("hdps401"):
+						{
+							return new HdPsXxxController(key, name, new HdPs401(ipid, Global.ControlSystem), props);
+						}
+					case ("hdps402"):
+						{
+							return new HdPsXxxController(key, name, new HdPs402(ipid, Global.ControlSystem), props);
+						}
+					case ("hdps621"):
+						{
+							return new HdPsXxxController(key, name, new HdPs621(ipid, Global.ControlSystem), props);
+						}
+					case ("hdps622"):
+						{
+							return new HdPsXxxController(key, name, new HdPs622(ipid, Global.ControlSystem), props);
+						}
+					default:
+						{
+							Debug.Console(1, "Factory failed to create new {0} device", type);
+							return null;
+						}
+				}
+			}
+		}
+
+
+		#endregion
+	}
+}

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

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.DM.Config;
+
+namespace PepperDash_Essentials_DM.Config
+{
+	public class HdPsXxxPropertiesConfig
+	{
+		[JsonProperty("control")]
+		public ControlPropertiesConfig Control { get; set; }
+
+		[JsonProperty("inputs")]
+		//public Dictionary<uint, InputPropertiesConfig> Inputs { get; set; } 
+		public Dictionary<uint, string> Inputs { get; set; } 
+
+		[JsonProperty("outputs")]
+		//public Dictionary<uint, InputPropertiesConfig> Outputs { get; set; }
+		public Dictionary<uint, string> Outputs { get; set; }
+
+		public HdPsXxxPropertiesConfig()
+		{
+			//Inputs = new Dictionary<uint, InputPropertiesConfig>();
+			//Outputs = new Dictionary<uint, InputPropertiesConfig>();
+
+			Inputs = new Dictionary<uint, string>();
+			Outputs = new Dictionary<uint, string>();
+		}
+	}
+}

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

@@ -7,6 +7,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash_Essentials_DM;
+using System.Collections.Generic;
 
 namespace PepperDash.Essentials.DM
 {
@@ -16,7 +17,7 @@ namespace PepperDash.Essentials.DM
     /// </summary>
     [Description("Wrapper Class for DM-RMC-4K-SCALER-C")]
     public class DmRmc4kScalerCController : DmRmcControllerBase, IRoutingInputsOutputs, IBasicVolumeWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp
+        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp, IBasicVideoMuteWithFeedback
     {
         private readonly DmRmc4kScalerC _rmc;
 
@@ -68,6 +69,7 @@ namespace PepperDash.Essentials.DM
 
             AddToFeedbackList(DmInHdcpStateFeedback);
 
+            VideoMuteIsOn = new BoolFeedback("HdmiOutputVideoMuteIsOn", () => _rmc.HdmiOutput.BlankEnabledFeedback.BoolValue);
 
             _rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
             _rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
@@ -83,6 +85,10 @@ namespace PepperDash.Essentials.DM
             {
                 VideoOutputResolutionFeedback.FireUpdate();
             }
+            else if (args.EventId == EndpointOutputStreamEventIds.BlankEnabledFeedbackEventId)
+            {
+                VideoMuteIsOn.FireUpdate();
+            }
         }
 
         void ConnectedDevice_DeviceInformationChange(ConnectedDeviceInformation connectedDevice, ConnectedDeviceEventArgs args)
@@ -216,5 +222,40 @@ namespace PepperDash.Essentials.DM
             _rmc.DmInput.HdcpCapability = hdcpState;
         }
 
+
+        #region IBasicVideoMuteWithFeedback Members
+
+        public BoolFeedback VideoMuteIsOn
+        {
+            get;
+            private set;
+        }
+
+        public void VideoMuteOn()
+        {
+            Debug.Console(2, this, "Video Mute On");
+            _rmc.HdmiOutput.BlankEnabled();          
+        }
+
+        public void VideoMuteOff()
+        {
+            Debug.Console(2, this, "Video Mute Off");
+            _rmc.HdmiOutput.BlankDisabled();
+        }
+
+        #endregion
+
+        #region IBasicVideoMute Members
+
+        public void VideoMuteToggle()
+        {
+            Debug.Console(2, this, "Video Mute Toggle");
+            if (_rmc.HdmiOutput.BlankEnabledFeedback.BoolValue == true) 
+                VideoMuteOff();
+            else 
+                VideoMuteOn();
+        }
+
+        #endregion
     }
 }

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

@@ -61,6 +61,11 @@ namespace PepperDash.Essentials.DM
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
             }
 
+            LinkDmRmcToApi(rmc, trilist, joinMap);
+        }
+
+        protected void LinkDmRmcToApi(DmRmcControllerBase rmc, BasicTriList trilist, DmRmcControllerJoinMap joinMap)
+        {
             Debug.Console(1, rmc, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 
             IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
@@ -139,6 +144,18 @@ namespace PepperDash.Essentials.DM
 
             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;
             if (routingWithFeedback == null) return;
 
@@ -149,6 +166,7 @@ namespace PepperDash.Essentials.DM
 
             trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber,
                 a => routingWithFeedback.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
+
         }
 
         #region Implementation of IDeviceInfoProvider

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.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
@@ -104,6 +104,8 @@
     <Compile Include="Chassis\HdMd8xNController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEBridgeableController.cs" />
     <Compile Include="Chassis\HdMdNxM4kEController.cs" />
+    <Compile Include="Chassis\HdPsXxxController.cs" />
+    <Compile Include="Config\HdPsXxxPropertiesConfig.cs" />
     <Compile Include="Config\InputPropertiesConfig.cs" />
     <Compile Include="Endpoints\EndpointInterfaces.cs" />
     <Compile Include="Endpoints\DGEs\DgeJoinMap.cs" />
@@ -153,6 +155,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VideoStatusHelpers.cs" />
     <None Include="app.config" />
+    <None Include="ClassDiagram1.cd" />
     <None Include="Properties\ControlSystem.cfg" />
   </ItemGroup>
   <ItemGroup>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs

@@ -216,6 +216,10 @@ namespace PepperDash.Essentials.Devices.Common.Codec
                 return joinable;
             }
         }
+
+		[JsonProperty("dialable")]
+		public bool Dialable { get; set; }
+
         //public string ConferenceNumberToDial { get; set; }
         [JsonProperty("conferencePassword")]
         public string ConferencePassword { get; set; }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

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

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs

@@ -348,6 +348,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
                     if (b.DialInfo.ConnectMode.Value.ToLower() == "obtp" || b.DialInfo.ConnectMode.Value.ToLower() == "manual")
                         meeting.IsOneButtonToPushMeeting = true;
 
+				meeting.Dialable = b.DialInfo.Calls.Call.Count > 0;
+
                 if (b.DialInfo.Calls.Call != null)
                 {
                     foreach (Call c in b.DialInfo.Calls.Call)

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

@@ -940,7 +940,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		        //digitals
 		        tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, meeting.Joinable);
-		        tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, meeting.Id != "0");
+		        tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, meeting.Dialable);
 
 		        //serials
 		        tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs

@@ -1510,6 +1510,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				meeting.Privacy = b.IsPrivate ? eMeetingPrivacy.Private : eMeetingPrivacy.Public;
 
+				meeting.Dialable = meeting.Id != "0";
+
 				// No meeting.Calls data exists for Zoom Rooms.  Leaving out for now.
 				var now = DateTime.Now;
 				if (meeting.StartTime < now && meeting.EndTime < now)

packages.config

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