fix: reapply fixes for fileIO 4 series

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

@@ -226,66 +226,66 @@ namespace PepperDash.Essentials
             }
         }
 
-        public override void Initialize()
+        void Initialize()
         {
             try
             {
-                //if (DefaultAudioDevice is IBasicVolumeControls)
-                //    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-                //else if (DefaultAudioDevice is IHasVolumeDevice)
-                //    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-                //CurrentVolumeControls = DefaultVolumeControls;
+                if (DefaultAudioDevice is IBasicVolumeControls)
+                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
+                else if (DefaultAudioDevice is IHasVolumeDevice)
+                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
+                CurrentVolumeControls = DefaultVolumeControls;
 
 
-                //// Combines call feedback from both codecs if available
-                //InCallFeedback = new BoolFeedback(() =>
-                //{
-                //    bool inAudioCall = false;
-                //    bool inVideoCall = false;
+                // Combines call feedback from both codecs if available
+                InCallFeedback = new BoolFeedback(() =>
+                {
+                    bool inAudioCall = false;
+                    bool inVideoCall = false;
 
-                //    if (AudioCodec != null)
-                //        inAudioCall = AudioCodec.IsInCall;
+                    if (AudioCodec != null)
+                        inAudioCall = AudioCodec.IsInCall;
 
-                //    if (VideoCodec != null)
-                //        inVideoCall = VideoCodec.IsInCall;
+                    if (VideoCodec != null)
+                        inVideoCall = VideoCodec.IsInCall;
 
-                //    if (inAudioCall || inVideoCall)
-                //        return true;
-                //    else
-                //        return false;
-                //});
+                    if (inAudioCall || inVideoCall)
+                        return true;
+                    else
+                        return false;
+                });
 
-                //SetupDisplays();
+                SetupDisplays();
 
-                //// Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
-                //this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
+                // 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.");
+                Debug.Console(2, this, "Microphone Privacy Config evaluated.");
 
-                //// Get emergency object, if any
-                //this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
+                // Get emergency object, if any
+                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.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
+                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
 
-                //if (AudioCodec != null)
-                //    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                if (AudioCodec != null)
+                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
 
-                //IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-                //VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
+                IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
-                //// link privacy to VC (for now?)
-                //PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-                //VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
+                // link privacy to VC (for now?)
+                PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
+                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];
-
-            Displays.Clear();
+            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
 
             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 += PowerIsOnFeedback_OutputChange;
-
-                        if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                        {
-                            SetDefaultLevels();
-                        }
-                    }
-
-                    display.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
-                    display.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-
-                    display.IsCoolingDownFeedback.OutputChange -= IsCoolingDownFeedback_OutputChange;
-                    display.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
+                    {
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
+                        {
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                            {
+                                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                                //    CurrentSourceInfo = null;
+                                OnFeedback.FireUpdate();
+                            }
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+                            {
+                                SetDefaultLevels();
+                            }
+                        };
+                    }
+
+                    display.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                    {
+                        IsWarmingUpFeedback.FireUpdate();
+                        if (!IsWarmingUpFeedback.BoolValue)
+                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                    };
+                    display.IsCoolingDownFeedback.OutputChange += (o, a) =>
+                    {
+                        IsCoolingDownFeedback.FireUpdate();
+                    };
 
                 }
             }
-        }
-
-        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))
@@ -386,143 +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;
-
-            return base.Deactivate();
         }
 
         public override bool CustomActivate()
-        {
-            try
-            {
-                if (DefaultAudioDevice is IBasicVolumeControls)
-                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-                else if (DefaultAudioDevice is IHasVolumeDevice)
-                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-                CurrentVolumeControls = DefaultVolumeControls;
-
-
-                // Combines call feedback from both codecs if available
-                InCallFeedback = new BoolFeedback(() =>
-                {
-                    bool inAudioCall = false;
-                    bool inVideoCall = false;
-
-                    if (AudioCodec != null)
-                        inAudioCall = AudioCodec.IsInCall;
-
-                    if (VideoCodec != null)
-                        inVideoCall = VideoCodec.IsInCall;
-
-                    if (inAudioCall || inVideoCall)
-                        return true;
-                    else
-                        return false;
-                });
-
-                SetupDisplays();
-
-                // Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
-                this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
-
-                Debug.Console(2, this, "Microphone Privacy Config evaluated.");
-
-                // Get emergency object, if any
-                this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
-
-                Debug.Console(2, this, "Emergency Config evaluated.");
-
-                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);
-            }
-
-            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();
-        }
-
+        {
+            // 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();
+        }
 
         /// <summary>
         /// 

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,60 +242,8 @@ namespace PepperDash.Essentials
             }
         }
 
-
-        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);
-            }
-
-			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 Deactivate()
-        {
-
-            // Stop listining to this event when room deactivated
-            VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
-
-            return base.Deactivate();
-        }
-
-        public override bool CustomActivate()
-        {
+        void InitializeRoom()
+		{
             try
             {
                 if (DefaultAudioDevice is IBasicVolumeControls)
@@ -332,15 +278,32 @@ namespace PepperDash.Essentials
                     var dispTwoWay = disp as IHasPowerControlWithFeedback;
                     if (dispTwoWay != null)
                     {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange; 
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
+                            {
+                                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 += IsWarmingUpFeedback_OutputChange;
+                    disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                    {
+                        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;
                 }
 
 
@@ -354,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 -= 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;
-
+                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
 
                 IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
                 // link privacy to VC (for now?)
                 PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
@@ -386,91 +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);
+            }
+
+			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>

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