Merge tag '1.13.3-hotfix-2156' into feature/DmHdcpEnhancements

.github/workflows/add-issues-to-project.yml

@@ -0,0 +1,37 @@
+name: Add bugs to bugs project
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+      
+jobs:
+  check-secret:
+    runs-on: ubuntu-latest
+    outputs:
+      my-key: ${{ steps.my-key.outputs.defined }}
+    steps:
+        - id: my-key
+          if: "${{ env.MY_KEY != '' }}"
+          run: echo "::set-output name=defined::true"
+          env:
+              MY_KEY: ${{ secrets.PROJECT_URL }}
+  throw-error: 
+    name: Check
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key != 'true'
+    steps:
+      - run: echo "The Project URL Repo Secret is empty"
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key == 'true'
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: ${{ secrets.PROJECT_URL }}
+          github-token: ${{ secrets.GH_PROJECTS_PASSWORD }}
+

.gitignore

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

PepperDashEssentials/ControlSystem.cs

@@ -93,28 +93,27 @@ namespace PepperDash.Essentials
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}{1}", tl, CrestronEnvironment.NewLine);
+                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
             },
             "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 CrestronConsole.ConsoleCommandResponse
-                    ("Current running configuration. This is the merged system and template configuration" + CrestronEnvironment.NewLine);
+                    ("Current running configuration. This is the merged system and template configuration");
                 CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
                     (ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
             }, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(s =>
+            CrestronConsole.AddNewConsoleCommand(s => 
                 CrestronConsole.ConsoleCommandResponse(
-                "This system can be found at the following URLs:{2}" +
+                "This system can be found at the following URLs:\r\n" +
-                "System URL:   {0}{2}" +
+                "System URL:   {0}\r\n" +
-                "Template URL: {1}{2}",
+                "Template URL: {1}", 
-                ConfigReader.ConfigObject.SystemUrl,
+                ConfigReader.ConfigObject.SystemUrl, 
-                ConfigReader.ConfigObject.TemplateUrl,
+                ConfigReader.ConfigObject.TemplateUrl), 
-                CrestronEnvironment.NewLine),
+                "portalinfo", 
-                "portalinfo",
+                "Shows portal URLS from configuration", 
-                "Shows portal URLS from configuration",
                 ConsoleAccessLevelEnum.AccessOperator);
 
 

PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs

@@ -226,66 +226,66 @@ namespace PepperDash.Essentials
             }
         }
 
-        public override void Initialize()
+        void Initialize()
         {
             try
             {
-                //if (DefaultAudioDevice is IBasicVolumeControls)
+                if (DefaultAudioDevice is IBasicVolumeControls)
-                //    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
+                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-                //else if (DefaultAudioDevice is IHasVolumeDevice)
+                else if (DefaultAudioDevice is IHasVolumeDevice)
-                //    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
+                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-                //CurrentVolumeControls = DefaultVolumeControls;
+                CurrentVolumeControls = DefaultVolumeControls;
 
 
-                //// Combines call feedback from both codecs if available
+                // Combines call feedback from both codecs if available
-                //InCallFeedback = new BoolFeedback(() =>
+                InCallFeedback = new BoolFeedback(() =>
-                //{
+                {
-                //    bool inAudioCall = false;
+                    bool inAudioCall = false;
-                //    bool inVideoCall = false;
+                    bool inVideoCall = false;
 
-                //    if (AudioCodec != null)
+                    if (AudioCodec != null)
-                //        inAudioCall = AudioCodec.IsInCall;
+                        inAudioCall = AudioCodec.IsInCall;
 
-                //    if (VideoCodec != null)
+                    if (VideoCodec != null)
-                //        inVideoCall = VideoCodec.IsInCall;
+                        inVideoCall = VideoCodec.IsInCall;
 
-                //    if (inAudioCall || inVideoCall)
+                    if (inAudioCall || inVideoCall)
-                //        return true;
+                        return true;
-                //    else
+                    else
-                //        return false;
+                        return false;
-                //});
+                });
 
-                //SetupDisplays();
+                SetupDisplays();
 
-                //// Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
+                // Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
-                //this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
+                this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
 
-                //Debug.Console(2, this, "Microphone Privacy Config evaluated.");
+                Debug.Console(2, this, "Microphone Privacy Config evaluated.");
 
-                //// Get emergency object, if any
+                // Get emergency object, if any
-                //this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
+                this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
 
-                //Debug.Console(2, this, "Emergency Config evaluated.");
+                Debug.Console(2, this, "Emergency Config evaluated.");
 
 
-                //VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-                //VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
+                VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
 
-                //if (AudioCodec != null)
+                if (AudioCodec != null)
-                //    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
 
-                //IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-                //VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
-                //// link privacy to VC (for now?)
+                // link privacy to VC (for now?)
-                //PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
+                PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-                //VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
 
-                //CallTypeFeedback = new IntFeedback(() => 0);
+                CallTypeFeedback = new IntFeedback(() => 0);
 
                 SetSourceListKey();
 
-                //EnablePowerOnToLastSource = true;
+                EnablePowerOnToLastSource = true;
             }
             catch (Exception e)
             {
@@ -297,9 +297,7 @@ namespace PepperDash.Essentials
         {
             //DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
 
-            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
+            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
-
-            Displays.Clear();
 
             foreach (var destination in destinationList)
             {
@@ -316,54 +314,37 @@ namespace PepperDash.Essentials
                     // Link power, warming, cooling to display
                     var dispTwoWay = display as IHasPowerControlWithFeedback;
                     if (dispTwoWay != null)
-                    {
+                    {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
+                        {
-
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                        if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+                            {
-                        {
+                                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                            SetDefaultLevels();
+                                //    CurrentSourceInfo = null;
-                        }
+                                OnFeedback.FireUpdate();
-                    }
+                            }
-
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                    display.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
+                            {
-                    display.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
+                                SetDefaultLevels();
-
+                            }
-                    display.IsCoolingDownFeedback.OutputChange -= IsCoolingDownFeedback_OutputChange;
+                        };
-                    display.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
+                    }
+
+                    display.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                    {
+                        IsWarmingUpFeedback.FireUpdate();
+                        if (!IsWarmingUpFeedback.BoolValue)
+                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                    };
+                    display.IsCoolingDownFeedback.OutputChange += (o, a) =>
+                    {
+                        IsCoolingDownFeedback.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 = 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))
@@ -373,9 +354,9 @@ namespace PepperDash.Essentials
             else
             {
                 SetSourceListKey(Key);
-            }
+            }
-
+
-            SetUpVideoCodec();
+            SetCodecExternalSources();
         }
 
         protected override void CustomSetConfig(DeviceConfig config)
@@ -386,150 +367,26 @@ namespace PepperDash.Essentials
                 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
+            // Add Occupancy object from config
-            {
+            if (PropertiesConfig.Occupancy != null)
-                if (DefaultAudioDevice is IBasicVolumeControls)
+            {
-                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Setting Occupancy Provider for room");
-                else if (DefaultAudioDevice is IHasVolumeDevice)
+                this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
-                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.");
-
-                if (AudioCodec != null)
-                {
-                    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);
-
-                // link privacy to VC (for now?)
-                PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
-
-                CallTypeFeedback = new IntFeedback(() => 0);
-
-                SetSourceListKey();
-
-                EnablePowerOnToLastSource = true;
-
-
-                // Add Occupancy object from config
-                if (PropertiesConfig.Occupancy != null)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Setting Occupancy Provider for room");
-                    this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                        IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
-                }
-
-                this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-                this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-
-                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();
-        }
-
 
+            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
+            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
+
+            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
+            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
+
+            return base.CustomActivate();
+        }
 
         /// <summary>
         /// 
@@ -922,9 +779,7 @@ namespace PepperDash.Essentials
                         videoCodecWithExternalSwitching.AddExternalSource(codecInputConnectorName, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
                         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,8 +19,6 @@ namespace PepperDash.Essentials
 {
     public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IEssentialsHuddleVtc1Room
     {
-        private IEssentialsRoomCombiner _roomCombiner;
-
         private bool _codecExternalSourceChange;
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
@@ -236,7 +234,7 @@ namespace PepperDash.Essentials
                     throw new ArgumentNullException("DefaultAudioDevice cannot be null");
                 }
 
-                Initialize();
+                InitializeRoom();
             }
             catch (Exception e)
             {
@@ -244,65 +242,8 @@ 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
             {
                 if (DefaultAudioDevice is IBasicVolumeControls)
@@ -337,15 +278,32 @@ namespace PepperDash.Essentials
                     var dispTwoWay = disp as IHasPowerControlWithFeedback;
                     if (dispTwoWay != null)
                     {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
-                        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 -= IsWarmingUpFeedback_OutputChange;
+                    disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
-                    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;
                 }
 
 
@@ -359,30 +317,20 @@ namespace PepperDash.Essentials
                 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();
-                    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);
 
@@ -391,92 +339,72 @@ namespace PepperDash.Essentials
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
-
-
-                // Add Occupancy object from config
-                if (PropertiesConfig.Occupancy != null)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Setting Occupancy Provider for room");
-                    this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                        IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
-                }
-
-                this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-                this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-
-                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, "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);
             }
 
-            Debug.Console(0, this, "Room '{0}' Activated", Name);
+			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)
+            {
+                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Setting Occupancy Provider for room");
+                this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+            }
+
+            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
+            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
+
+            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
+            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
+			
             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>
@@ -904,8 +832,6 @@ 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/BridgeBase.cs

@@ -165,7 +165,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
                 Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
 
-                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
+                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                 {
                     Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
                         "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
@@ -409,7 +409,7 @@ namespace PepperDash.Essentials.Core.Bridges
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
         [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; }
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
 
 
         public class ApiDevicePropertiesConfig
@@ -442,7 +442,7 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -457,34 +457,34 @@ namespace PepperDash.Essentials.Core.Bridges
             {
                 case "eiscapiadv":
                 case "eiscapiadvanced":
-                    {
+                {
-                        eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                    eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
-                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
+                    break;
-                    }
+                }
                 case "eiscapiadvancedserver":
-                    {
+                {
-                        eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                    eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                        break;
+                    break;
-                    }
+                }
                 case "eiscapiadvancedclient":
-                    {
+                {
-                        eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
+                    break;
-                    }
+                }
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
+                {
+                    if (string.IsNullOrEmpty(controlProperties.RoomId))
                     {
-                        if (string.IsNullOrEmpty(controlProperties.RoomId))
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
-                        {
+                        eisc = null;
-                            Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
-                            eisc = null;
-                            break;
-                        }
-                        eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
-                            Global.ControlSystem);
                         break;
                     }
+                    eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                        Global.ControlSystem);
+                    break;
+                }
                 default:
                     eisc = null;
                     break;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -379,28 +379,28 @@ namespace PepperDash.Essentials.Core
         /// Prints a list of routing inputs and outputs by device key.
         /// </summary>
         /// <param name="s">Device key from which to report data</param>
-        public static void GetRoutingPorts(string s)
+	    public static void GetRoutingPorts(string s)
-        {
+	    {
-            var device = GetDeviceForKey(s);
+	        var device = GetDeviceForKey(s);
 
             if (device == null) return;
             var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
             var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
-            if (inputPorts != null)
+	        if (inputPorts != null)
-            {
+	        {
-                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:{2}", s, inputPorts.Count, CrestronEnvironment.NewLine);
+                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:", s, inputPorts.Count);
-                foreach (var routingInputPort in inputPorts)
+	            foreach (var routingInputPort in inputPorts)
-                {
+	            {
-                    CrestronConsole.ConsoleCommandResponse("{0}{1}", routingInputPort.Key, CrestronEnvironment.NewLine);
+                    CrestronConsole.ConsoleCommandResponse("{0}", routingInputPort.Key);
-                }
+	            }
-            }
+	        }
             if (outputPorts == null) return;
-            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:{2}", s, outputPorts.Count, CrestronEnvironment.NewLine);
+            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:", s, outputPorts.Count);
             foreach (var routingOutputPort in outputPorts)
             {
-                CrestronConsole.ConsoleCommandResponse("{0}{1}", routingOutputPort.Key, CrestronEnvironment.NewLine);
+                CrestronConsole.ConsoleCommandResponse("{0}", routingOutputPort.Key);
             }
-        }
+	    }
 
         /// <summary>
         /// Attempts to set the debug level of a device

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/PduInterfaces.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -9,7 +8,6 @@ namespace PepperDash_Essentials_Core.Devices
     /// <summary>
     /// Interface for any device that is able to control it'spower and has a configurable reboot time
     /// </summary>
-    [Obsolete("PepperDash_Essentials_Core.Devices is Deprecated - use PepperDash.Essentials.Core")]
     public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
     {
         /// <summary>
@@ -26,7 +24,6 @@ namespace PepperDash_Essentials_Core.Devices
     /// <summary>
     /// Interface for any device that contains a collection of IHasPowerReboot Devices
     /// </summary>
-    [Obsolete("PepperDash_Essentials_Core.Devices is Deprecated - use PepperDash.Essentials.Core")]
     public interface IHasControlledPowerOutlets : IKeyName
     {
         /// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/PowerInterfaces.cs

@@ -1,87 +0,0 @@
-using Crestron.SimplSharp;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Interface for any device that has a battery that can be monitored
-    /// </summary>
-    public interface IHasBatteryStats : IKeyName
-    {
-        int BatteryPercentage { get; }
-        int BatteryCautionThresholdPercentage { get;  }
-        int BatteryWarningThresholdPercentage { get; }
-        BoolFeedback BatteryIsWarningFeedback { get; }
-        BoolFeedback BatteryIsCautionFeedback { get; }
-        BoolFeedback BatteryIsOkFeedback { get; }
-        IntFeedback BatteryPercentageFeedback { get; }
-    }
-
-    /// <summary>
-    /// Interface for any device that has a battery that can be monitored and the ability to charge and discharge
-    /// </summary>
-    public interface IHasBatteryCharging : IHasBatteryStats
-    {
-        BoolFeedback BatteryIsCharging { get; }
-    }
-
-    /// <summary>
-    /// Interface for any device that has multiple batteries that can be monitored
-    /// </summary>
-    public interface IHasBatteries : IKeyName
-    {
-        ReadOnlyDictionary<string, IHasBatteryStats> Batteries { get; }   
-    }
-
-    public interface IHasBatteryStatsExtended : IHasBatteryStats
-    {
-        int InputVoltage { get; }
-        int OutputVoltage { get; }
-        int InptuCurrent { get; }
-        int OutputCurrent { get; }
-
-        IntFeedback InputVoltageFeedback { get; }
-        IntFeedback OutputVoltageFeedback { get; }
-        IntFeedback InputCurrentFeedback { get; }
-        IntFeedback OutputCurrentFeedback { get; }
-    }
-
-    /// <summary>
-    /// Interface for any device that is able to control its power, has a configurable reboot time, and has batteries that can be monitored
-    /// </summary>
-    public interface IHasPowerCycleWithBattery : IHasPowerCycle, IHasBatteryStats
-    {
-        
-    }
-
-    /// <summary>
-    /// Interface for any device that is able to control it's power and has a configurable reboot time
-    /// </summary>
-    public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
-    {
-        /// <summary>
-        /// Delay between power off and power on for reboot
-        /// </summary>
-        int PowerCycleTimeMs { get; }
-
-        /// <summary>
-        /// Reboot outlet
-        /// </summary>
-        void PowerCycle();
-    }
-
-    /// <summary>
-    /// Interface for any device that contains a collection of IHasPowerReboot Devices
-    /// </summary>
-    public interface IHasControlledPowerOutlets : IKeyName
-    {
-        /// <summary>
-        /// Collection of IPduOutlets
-        /// </summary>
-        ReadOnlyDictionary<int, IHasPowerCycle> PduOutlets { get; }
-
-    }
-
-
-
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -175,8 +175,8 @@ namespace PepperDash.Essentials.Core
         /// <param name="filter"></param>
         public static void GetDeviceFactoryTypes(string filter)
         {
-            var types = !string.IsNullOrEmpty(filter)
+            var types = !string.IsNullOrEmpty(filter) 
-                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value)
+                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value) 
                 : FactoryMethods;
 
             CrestronConsole.ConsoleCommandResponse("Device Types:");
@@ -186,12 +186,12 @@ namespace PepperDash.Essentials.Core
                 var description = type.Value.Description;
                 var cType = "Not Specified by Plugin";
 
-                if (type.Value.CType != null)
+                if(type.Value.CType != null)
                 {
                     cType = type.Value.CType.FullName;
                 }
 
-                CrestronConsole.ConsoleCommandResponse(
+                CrestronConsole.ConsoleCommandResponse( 
                     @"Type: '{0}' 
                     CType: '{1}' 
                     Description: {2}", type.Key, cType, description);

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

@@ -85,32 +85,18 @@ namespace PepperDash.Essentials.Core
 	    {
 	        if (_partitionSensor.IsOnline == false) return;
 
-            // Default to enable
+	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");            
-            _partitionSensor.Enable.BoolValue = true;
 
-	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");
+	        if (PropertiesConfig.Sensitivity != null)
-
+	        {
-            if (PropertiesConfig.Sensitivity != null)
+	            Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
-            {
+	                PropertiesConfig.Sensitivity);
-                Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
+                _partitionSensor.Sensitivity.UShortValue = (ushort) PropertiesConfig.Sensitivity;
-                    PropertiesConfig.Sensitivity);
+	        }	        
-                _partitionSensor.Sensitivity.UShortValue = (ushort)PropertiesConfig.Sensitivity;
+	        else
-            }
+	        {
-            else
+	            Debug.Console(1, this, "Sensitivity null, no value specified in config");
-            {
+	        }
-                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");
-            }
 
 	    }
 

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

@@ -16,9 +16,6 @@ namespace PepperDash_Essentials_Core.PartitionSensor
         /// The sensitivity range shall be between 1(lowest) to 10 (highest).
         /// </remarks>
         [JsonProperty("sensitivity")]
-        public ushort? Sensitivity { get; set; }
+        public ushort? Sensitivity { get; set; }
-
-        [JsonProperty("enable")]
-        public bool? Enable { get; set; }
     }
 }

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

@@ -200,7 +200,6 @@
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
-    <Compile Include="Devices\PowerInterfaces.cs" />
     <Compile Include="Web\RequestHandlers\AppDebugRequestHandler.cs" />
     <Compile Include="Web\RequestHandlers\GetFeedbacksForDeviceRequestHandler.cs" />
     <Compile Include="Web\EssentialsWebApiHelpers.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -195,12 +195,13 @@ namespace PepperDash.Essentials
         public static void ReportAssemblyVersions(string command)
         {
 
-            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:" + CrestronEnvironment.NewLine);
+            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:");
             foreach (var assembly in LoadedAssemblies)
             {
-                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}" + CrestronEnvironment.NewLine, assembly.Name, assembly.Version);
+                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}", assembly.Name, assembly.Version);
             }
         }
+
         /// <summary>
         /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
         /// </summary>

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; protected set; }
+        public IOccupancyStatusProvider RoomOccupancy { get; private set; }
 
         public bool OccupancyStatusProviderIsRemote { get; private set; }
 

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

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

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

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.DM
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
     /// </summary>
-	public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
+    public class DmBladeChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
     {
         private const string NonePortKey = "inputCard0--None";
 

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

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.DM
     /// 
     /// </summary>
     [Description("Wrapper class for all DM-MD chassis variants from 8x8 to 32x32")]
-    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
+    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
     {
         private const string NonePortKey = "inputCard0--None";
         public DMChassisPropertiesConfig PropertiesConfig { get; set; }

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

@@ -436,9 +436,9 @@ namespace PepperDash.Essentials.DM
                 }
                 return rx;
             }
-            else if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
+            else if (parentDev is DmChassisController)
             {
-                var controller = parentDev as IDmSwitchWithEndpointOnlineFeedback;
+                var controller = parentDev as DmChassisController;
                 var chassis = controller.Chassis;
                 var num = props.ParentOutputNumber;
                 Debug.Console(1, "Creating DM Chassis device '{0}'. Output number '{1}'.", key, num);

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -121,7 +121,7 @@ namespace PepperDash.Essentials.DM
 
             Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
             Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.DisplayPortInput.InputStreamChange += InputStreamChangeEvent;
+            Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
             Tx.BaseEvent += Tx_BaseEvent;
             Tx.OnlineStatusChange += Tx_OnlineStatusChange;
 
@@ -131,7 +131,8 @@ namespace PepperDash.Essentials.DM
             HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
 
             HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortInHdcpCapability",
+
+            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortHdcpCapability",
                 () => (int)tx.DisplayPortInput.HdcpCapabilityFeedback);
 
 
@@ -170,19 +171,13 @@ namespace PepperDash.Essentials.DM
                     (ActualActiveVideoInput == eVst.Hdmi1
                     && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-                    || (ActualActiveVideoInput == eVst.DisplayPort
-                    && tx.DisplayPortInput.VideoAttributes.HdcpActiveFeedback.BoolValue),
 
                 HdcpStateFeedbackFunc = () =>
                 {
                     if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString(); 
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                    return ActualActiveVideoInput == eVst.Hdmi2 ? tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString() : "";
-                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-                    return ActualActiveVideoInput == eVst.DisplayPort
-                        ? tx.DisplayPortInput.VideoAttributes.HdcpStateFeedback.ToString()
-                        : "";
                 },
 
                 VideoResolutionFeedbackFunc = () =>
@@ -191,8 +186,6 @@ namespace PepperDash.Essentials.DM
                         return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
                     if (ActualActiveVideoInput == eVst.Hdmi2)
                         return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.DisplayPort)
-                        return tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString();
                     return ActualActiveVideoInput == eVst.Vga ? tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString() : "";
                 },
                 VideoSyncFeedbackFunc = () =>
@@ -200,8 +193,6 @@ namespace PepperDash.Essentials.DM
                     && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Hdmi2
                     && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.DisplayPort
-                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
                     || (ActualActiveVideoInput == eVst.Vga
                     && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
 
@@ -220,15 +211,28 @@ namespace PepperDash.Essentials.DM
                 AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
                 AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
                 AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback, DisplayPortInHdcpCapabilityFeedback);
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback);
 
+            // Set Ports for CEC
             HdmiIn1.Port = Tx.HdmiInputs[1];
             HdmiIn2.Port = Tx.HdmiInputs[2];
-            DisplayPortIn.Port = Tx.DisplayPortInput;
             HdmiLoopOut.Port = Tx.HdmiOutput;
             DmOut.Port = Tx.DmOutput;
         }
 
+        void DisplayPortInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        {
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+
+            switch (args.EventId)
+            {
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                    DisplayPortVideoSyncFeedback.FireUpdate();
+                    break;
+            }
+        }
+
+
 
         public override bool CustomActivate()
         {
@@ -340,17 +344,11 @@ namespace PepperDash.Essentials.DM
                 case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
                     if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
                     if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
-                    if (inputStream == Tx.DisplayPortInput) DisplayPortInHdcpCapabilityFeedback.FireUpdate();
-
-                    Debug.Console(2, this, "DisplayPortHDCP Mode Trigger = {0}",
-                        DisplayPortInHdcpCapabilityFeedback.IntValue);
-
                     HdcpStateFeedback.FireUpdate();
                     break;
                 case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
                     if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
                     if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
-                    if (inputStream == Tx.DisplayPortInput) DisplayPortVideoSyncFeedback.FireUpdate();
                     break;
             }
         }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -1,6 +1,8 @@
 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;
@@ -42,7 +44,7 @@ namespace PepperDash.Essentials.DM
             if (typeName.StartsWith("dmtx401"))
                 return new DmTx401CController(key, name, new DmTx401C(dmInput), true);
             if (typeName.StartsWith("hdbasettx"))
-                return new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
+                new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
 
             return null;
         }
@@ -81,7 +83,6 @@ namespace PepperDash.Essentials.DM
         /// <param name="key"></param>
         /// <param name="name"></param>
         /// <param name="props"></param>
-        /// <param name="typeName"></param>
         /// <returns></returns>
         public static BasicDmTxControllerBase GetDmTxController(string key, string name, string typeName, DmTxPropertiesConfig props)
         {
@@ -127,10 +128,10 @@ namespace PepperDash.Essentials.DM
             BasicDmTxControllerBase tx;
             bool useChassisForOfflineFeedback = false;
 
-            if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
+            if (parentDev is DmChassisController)
             {
                 // Get the Crestron chassis and link stuff up
-                var switchDev = (parentDev as IDmSwitchWithEndpointOnlineFeedback);
+                var switchDev = (parentDev as DmChassisController);
                 var chassis = switchDev.Chassis;
 
                 //Check that the input is within range of this chassis' possible inputs
@@ -179,8 +180,7 @@ namespace PepperDash.Essentials.DM
                     return null;
                 }
             }
-
+            else if (parentDev is DmpsRoutingController)
-            if (parentDev is DmpsRoutingController)
             {
                 // Get the DMPS chassis and link stuff up
                 var dmpsDev = (parentDev as DmpsRoutingController);
@@ -237,8 +237,11 @@ namespace PepperDash.Essentials.DM
                 }
             }
 
-            Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
+            else
-            return null;
+            {
+                Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
+                return null;
+            }
         }
     }
 
@@ -333,6 +336,8 @@ namespace PepperDash.Essentials.DM
                 txR.VideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoInput.JoinNumber]);
                 txR.AudioSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioInput.JoinNumber]);
 
+                trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)tx.HdcpSupportCapability;
+
                 if (txR.InputPorts[DmPortName.HdmiIn] != null)
                 {
                     var inputPort = txR.InputPorts[DmPortName.HdmiIn];
@@ -379,7 +384,7 @@ namespace PepperDash.Essentials.DM
                     {
                         var intFeedback = tx.Feedbacks["HdmiIn2HdcpCapability"] as IntFeedback;
                         if (intFeedback != null)
-                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port2HdcpState.JoinNumber]);
+                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState.JoinNumber]);
                     }
 
                     if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
@@ -396,17 +401,16 @@ namespace PepperDash.Essentials.DM
 
                     if (tx.Feedbacks["DisplayPortInHdcpCapability"] != null)
                     {
-
                         var intFeedback = tx.Feedbacks["DisplayPortInHdcpCapability"] as IntFeedback;
                         if (intFeedback != null)
-
                             intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port3HdcpState.JoinNumber]);
+                    }
 
-                        if (inputPort.ConnectionType == eRoutingPortConnectionType.DisplayPort && inputPort.Port != null)
+                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
-                        {
+                    {
-                            var port = inputPort.Port as EndpointDisplayPortInput;
+                        var port = inputPort.Port as EndpointDisplayPortInput;
-                            SetHdcpCapabilityAction(port, joinMap.Port3HdcpState.JoinNumber, trilist);
+
-                        }
+                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port3HdcpState.JoinNumber, trilist);
                     }
                 }
 
@@ -463,7 +467,7 @@ namespace PepperDash.Essentials.DM
                     });
             }
             else
-            { 
+            {
                 trilist.SetUShortSigAction(join,
                         s =>
                         {
@@ -472,15 +476,17 @@ namespace PepperDash.Essentials.DM
             }
         }
 
-        private void SetHdcpCapabilityAction(EndpointDisplayPortInput port, uint join,
+        private void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointDisplayPortInput port, uint join,
             BasicTriList trilist)
         {
+
+
             trilist.SetUShortSigAction(join,
                 s =>
                 {
-                    Debug.Console(0, this, "Trying to set HDCP to {0} on port {1}", s, port.ToString());
+                    port.HdcpCapability = (eHdcpCapabilityType)s;
-                    port.HdcpCapability = (eHdcpCapabilityType) s;
                 });
+
         }
 
     }
@@ -489,22 +495,8 @@ namespace PepperDash.Essentials.DM
     {
         public DmTxControllerFactory()
         {
-            TypeNames = new List<string>
+            TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-            {
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
-                "dmtx200c",
-                "dmtx201c",
-                "dmtx201s",
-                "dmtx4k100c",
-                "dmtx4k202c",
-                "dmtx4kz202c",
-                "dmtx4k302c",
-                "dmtx4kz302c",
-                "dmtx401c",
-                "dmtx401s",
-                "dmtx4k100c1g",
-                "dmtx4kz100c1g",
-                "hdbasettx"
-            };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -514,8 +506,8 @@ namespace PepperDash.Essentials.DM
             Debug.Console(1, "Factory Attempting to create new DM-TX Device");
 
             var props = JsonConvert.DeserializeObject
-                <DmTxPropertiesConfig>(dc.Properties.ToString());
+                <PepperDash.Essentials.DM.Config.DmTxPropertiesConfig>(dc.Properties.ToString());
-            return DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
+            return PepperDash.Essentials.DM.DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
         }
     }
 

essentials-framework/Essentials DM/Essentials_DM/IDmSwitch.cs

@@ -16,17 +16,10 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM.Config;
 
 namespace PepperDash.Essentials.DM {
-    public interface IDmSwitch
+    public interface IDmSwitch {
-	{
         Switch Chassis { get; }
 
         Dictionary<uint, string> TxDictionary { get; }
         Dictionary<uint, string> RxDictionary { get; }
     }
-
-	public interface IDmSwitchWithEndpointOnlineFeedback : IDmSwitch
-	{
-		Dictionary<uint, BoolFeedback> InputEndpointOnlineFeedbacks { get; }
-		Dictionary<uint, BoolFeedback> OutputEndpointOnlineFeedbacks { get; }
-	}
 }