build: update PD Core version

Hotfix/vtc room activation deactivation changes

.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/Room/Types/EssentialsCombinedHuddleVtc1Room.cs

@@ -226,66 +226,66 @@ namespace PepperDash.Essentials
             }
         }
 
-        void Initialize()
+        public override 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,7 +297,9 @@ 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)
             {
@@ -314,37 +316,54 @@ namespace PepperDash.Essentials
                     // Link power, warming, cooling to display
                     var dispTwoWay = display 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)
-                                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                        {
-                                //    CurrentSourceInfo = null;
+                            SetDefaultLevels();
-                                OnFeedback.FireUpdate();
+                        }
-                            }
+                    }
-                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+
-                            {
+                    display.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
-                                SetDefaultLevels();
+                    display.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-                            }
+
-                        };
+                    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))
@@ -354,9 +373,9 @@ namespace PepperDash.Essentials
             else
             {
                 SetSourceListKey(Key);
-            }
+            }
-
+
-            SetCodecExternalSources();
+            SetUpVideoCodec();
         }
 
         protected override void CustomSetConfig(DeviceConfig config)
@@ -367,26 +386,150 @@ 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()
-        {
+        {
-            // Add Occupancy object from config
+            try
-            if (PropertiesConfig.Occupancy != null)
+            {
-            {
+                if (DefaultAudioDevice is IBasicVolumeControls)
-                Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Setting Occupancy Provider for room");
+                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-                this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
+                else if (DefaultAudioDevice is IHasVolumeDevice)
-                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-            }
+                CurrentVolumeControls = DefaultVolumeControls;
-
+
-            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
+
-            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
+                // Combines call feedback from both codecs if available
-
+                InCallFeedback = new BoolFeedback(() =>
-            this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
+                {
-            this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
+                    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();
+        }
+
+
 
         /// <summary>
         /// 
@@ -779,7 +922,9 @@ 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,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,8 +244,65 @@ 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)
@@ -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;
                 }
 
 
@@ -317,20 +359,30 @@ 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);
 
@@ -339,72 +391,92 @@ 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 Initializing Room: {0}", e);
+                Debug.Console(0, this, "Error Activiating 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();
+            Debug.Console(0, this, "Room '{0}' Activated", Name);
-        }
-
-        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>
@@ -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/Devices/PduInterfaces.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -8,6 +9,7 @@ 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>
@@ -24,6 +26,7 @@ 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

@@ -0,0 +1,87 @@
+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/File/FileIO.cs

@@ -9,18 +9,18 @@ using Crestron.SimplSharpPro.CrestronThread;
 
 namespace PepperDash.Essentials.Core
 {
-    public static class FileIO
+	public static class FileIO
-    {
+	{
 
-        static CCriticalSection fileLock = new CCriticalSection();
+		static CCriticalSection fileLock = new CCriticalSection();
-        public delegate void GotFileEventHandler(object sender, FileEventArgs e);
+		public delegate void GotFileEventHandler(object sender, FileEventArgs e);
-        public static event GotFileEventHandler GotFileEvent;
+		public static event GotFileEventHandler GotFileEvent;
 
-        /// <summary>
+		/// <summary>
-        /// Get the full file info from a path/filename, can include wildcards.
+		/// Get the full file info from a path/filename, can include wildcards.
-        /// </summary>
+		/// </summary>
-        /// <param name="fileName"></param>
+		/// <param name="fileName"></param>
-        /// <returns></returns>
+		/// <returns></returns>
         public static FileInfo[] GetFiles(string fileName)
         {
             string fullFilePath = Global.FilePathPrefix + fileName;
@@ -54,228 +54,228 @@ namespace PepperDash.Essentials.Core
         }
 
 
-        /// <summary>
+		/// <summary>
-        /// Get the data from string path/filename
+		/// Get the data from string path/filename
-        /// </summary>
+		/// </summary>
-        /// <param name="fileName"></param>
+		/// <param name="fileName"></param>
-        /// <returns></returns>
+		/// <returns></returns>
-        public static string ReadDataFromFile(string fileName)
+		public static string ReadDataFromFile(string fileName)
-        {
+		{
-            try
+			try
-            {
+			{
-                return ReadDataFromFile(GetFile(fileName));
+				return ReadDataFromFile(GetFile(fileName));
-            }
+			}
-            catch (Exception e)
+			catch (Exception e)
-            {
+			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-                return "";
+				return "";
-            }
+			}
-        }
+		}
 
-        /// <summary>
+		/// <summary>
-        /// Get the data with fileInfo object 
+		/// Get the data with fileInfo object 
-        /// </summary>
+		/// </summary>
-        /// <param name="fileName"></param>
+		/// <param name="fileName"></param>
-        /// <returns></returns>
+		/// <returns></returns>
-        public static string ReadDataFromFile(FileInfo file)
+		public static string ReadDataFromFile(FileInfo file)
-        {
+		{
-            try
+			try
-            {
+			{
-                if (fileLock.TryEnter())
+				if (fileLock.TryEnter())
-                {
+				{
-                    DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
+					DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
-                    Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
+					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
-                    if (File.Exists(file.FullName))
+					if (File.Exists(file.FullName))
-                    {
+					{
-                        using (StreamReader r = new StreamReader(file.FullName))
+						using (StreamReader r = new StreamReader(file.FullName))
-                        {
+						{
-                            return r.ReadToEnd();
+							return r.ReadToEnd();
-                        }
+						}
-                    }
+					}
-                    else
+					else
-                    {
+					{
-                        Debug.Console(2, "File {0} does not exsist", file.FullName);
+						Debug.Console(2, "File {0} does not exsist", file.FullName);
-                        return "";
+						return "";
-                    }
+					}
-                }
+				}
-                else
+				else
-                {
+				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-                    return "";
+					return "";
-                }
+				}
+				
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				return "";
+			}
+			finally
+			{
+				if (fileLock != null && !fileLock.Disposed)
+					fileLock.Leave();
 
-            }
+			}
-            catch (Exception e)
+		}
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-                return "";
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
-
-            }
-        }
 
 
-        public static void ReadDataFromFileASync(string fileName)
+		public static void ReadDataFromFileASync(string fileName)
-        {
+		{
-            try
+			try
-            {
+			{
-                ReadDataFromFileASync(GetFile(fileName));
+				ReadDataFromFileASync(GetFile(fileName));
-            }
+			}
-            catch (Exception e)
+			catch (Exception e)
-            {
+			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-            }
+			}
-        }
+		}
 
-        public static void ReadDataFromFileASync(FileInfo file)
+		public static void ReadDataFromFileASync(FileInfo file)
-        {
+		{
-            try
+			try
-            {
+			{
-                CrestronInvoke.BeginInvoke(o => _ReadDataFromFileASync(file));
+				CrestronInvoke.BeginInvoke(o => _ReadDataFromFileASync(file));
-            }
+			}
-            catch (Exception e)
+			catch (Exception e)
-            {
+			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-            }
+			}
-        }
+		}
 
-        private static void _ReadDataFromFileASync(FileInfo file)
+		private static void _ReadDataFromFileASync(FileInfo file)
-        {
+		{
-            string data;
+			string data;
-            try
+			try
-            {
+			{
-                if (fileLock.TryEnter())
+				if (fileLock.TryEnter())
-                {
+				{
-                    DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
+					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
-                    Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
+					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
 
-                    if (File.Exists(file.FullName))
+					if (File.Exists(file.FullName))
-                    {
+					{
-                        using (StreamReader r = new StreamReader(file.FullName))
+						using (StreamReader r = new StreamReader(file.FullName))
-                        {
+						{
-                            data = r.ReadToEnd();
+							data = r.ReadToEnd();
-                        }
+						}
-                    }
+					}
-                    else
+					else
-                    {
+					{
-                        Debug.Console(2, "File {0} Does not exsist", file.FullName);
+						Debug.Console(2, "File {0} Does not exsist", file.FullName);
-                        data = "";
+						data = "";
-                    }
+					}
-                    GotFileEvent.Invoke(null, new FileEventArgs(data));
+					GotFileEvent.Invoke(null, new FileEventArgs(data));
-                }
+				}
-                else
+				else
-                {
+				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-                }
+				}
 
-            }
+			}
-            catch (Exception e)
+			catch (Exception e)
-            {
+			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO read failed: \r{0}", e);
-                data = "";
+				data = "";
-            }
+			}
-            finally
+			finally
-            {
+			{
-                if (fileLock != null && !fileLock.Disposed)
+				if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
+					fileLock.Leave();
 
-            }
+			}
 
 
 
-        }
+		}
 
-        /// <summary>
+		/// <summary>
-        /// 
+		/// 
-        /// </summary>
+		/// </summary>
-        /// <param name="data"></param>
+		/// <param name="data"></param>
-        /// <param name="filePath"></param>
+		/// <param name="filePath"></param>
-        /// <summary>
+		/// <summary>
-        /// 
+		/// 
-        /// </summary>
+		/// </summary>
-        /// <param name="data"></param>
+		/// <param name="data"></param>
-        /// <param name="filePath"></param>
+		/// <param name="filePath"></param>
-        public static void WriteDataToFile(string data, string filePath)
+		public static void WriteDataToFile(string data, string filePath)
-        {
+		{
-            Thread _WriteFileThread;
+			Thread _WriteFileThread;
             _WriteFileThread = new Thread((O) => _WriteFileMethod(data, Global.FilePathPrefix + "/" + filePath), null, Thread.eThreadStartOptions.CreateSuspended);
-            _WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
+			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
-            _WriteFileThread.Start();
+			_WriteFileThread.Start();
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
 
-        }
+		}
 
-        static object _WriteFileMethod(string data, string filePath)
+		static object _WriteFileMethod(string data, string filePath)
-        {
+		{
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write file: '{0}'", filePath);
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write file: '{0}'", filePath);
 
-            try
+			try
-            {
+			{
-                if (fileLock.TryEnter())
+				if (fileLock.TryEnter())
-                {
+				{
 
                     using (StreamWriter sw = new StreamWriter(filePath))
-                    {
+					{
-                        sw.Write(data);
+						sw.Write(data);
-                        sw.Flush();
+						sw.Flush();
-                    }
+					}
 
-                }
+				}
-                else
+				else
-                {
+				{
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
-                }
+				}
 
-            }
+			}
-            catch (Exception e)
+			catch (Exception e)
-            {
+			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO write failed: \r{0}", e);
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO write failed: \r{0}", e);
-            }
+			}
-            finally
+			finally
-            {
+			{
-                if (fileLock != null && !fileLock.Disposed)
+				if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
+					fileLock.Leave();
 
-            }
+			}
-            return null;
+			return null;
 
-        }
+		}
 
-        /// <summary>
+		/// <summary>
-        /// 
+		/// 
-        /// </summary>
+		/// </summary>
-        /// <returns></returns>
+		/// <returns></returns>
-        public static bool FileIoUnitTest()
+		public static bool FileIoUnitTest()
-        {
+		{
-            var testData = "Testing FileIO";
+			var testData = "Testing FileIO";
-            FileIO.WriteDataToFile(testData, "\\user\\FileIOTest.pdt");
+			FileIO.WriteDataToFile(testData, "\\user\\FileIOTest.pdt");
 
-            var file = FileIO.GetFile("\\user\\*FileIOTest*");
+			var file = FileIO.GetFile("\\user\\*FileIOTest*");
+			
+			var readData = FileIO.ReadDataFromFile(file);
+			Debug.Console(0, "Returned {0}", readData);
+			File.Delete(file.FullName);
+			if (testData == readData)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
 
-            var readData = FileIO.ReadDataFromFile(file);
+	}
-            Debug.Console(0, "Returned {0}", readData);
+	public class FileEventArgs
-            File.Delete(file.FullName);
+	{
-            if (testData == readData)
+		public FileEventArgs(string data) { Data = data; }
-            {
+		public string Data { get; private set; } // readonly
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
 
-    }
+	}
-    public class FileEventArgs
-    {
-        public FileEventArgs(string data) { Data = data; }
-        public string Data { get; private set; } // readonly
-
-    }
 }

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

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

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

@@ -16,6 +16,9 @@ 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,6 +200,7 @@
     <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/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 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)

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.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>