Merge branch 'development' into feature/GenericHttpClientOptions

Feature: Add constructor to set client options

feature: Add overloaded methods to set Request Types for Client Requests

.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,177 +226,7 @@ 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;
-
-
-                //// Combines call feedback from both codecs if available
-                //InCallFeedback = new BoolFeedback(() =>
-                //{
-                //    bool inAudioCall = false;
-                //    bool inVideoCall = false;
-
-                //    if (AudioCodec != null)
-                //        inAudioCall = AudioCodec.IsInCall;
-
-                //    if (VideoCodec != null)
-                //        inVideoCall = VideoCodec.IsInCall;
-
-                //    if (inAudioCall || inVideoCall)
-                //        return true;
-                //    else
-                //        return false;
-                //});
-
-                //SetupDisplays();
-
-                //// Get Microphone Privacy object, if any  MUST HAPPEN AFTER setting InCallFeedback
-                //this.MicrophonePrivacy = EssentialsRoomConfigHelper.GetMicrophonePrivacy(PropertiesConfig, this);
-
-                //Debug.Console(2, this, "Microphone Privacy Config evaluated.");
-
-                //// Get emergency object, if any
-                //this.Emergency = EssentialsRoomConfigHelper.GetEmergency(PropertiesConfig, this);
-
-                //Debug.Console(2, this, "Emergency Config evaluated.");
-
-
-                //VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-                //VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
-
-                //if (AudioCodec != null)
-                //    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-
-                //IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
-                //VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
-
-                //// link privacy to VC (for now?)
-                //PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-                //VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
-
-                //CallTypeFeedback = new IntFeedback(() => 0);
-
-                SetSourceListKey();
-
-                //EnablePowerOnToLastSource = true;
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error Initializing Room: {0}", e);
-            }
-        }
-
-        private void SetupDisplays()
-        {
-            //DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
-
-            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
-
-            Displays.Clear();
-
-            foreach (var destination in destinationList)
-            {
-                var dest = destination.Value.SinkDevice as IRoutingSinkWithSwitching;
-
-                if (dest != null)
-                {
-                    Displays.Add(dest);
-                }
-
-                var display = dest as DisplayBase;
-                if (display != null)
-                {
-                    // Link power, warming, cooling to display
-                    var dispTwoWay = display as IHasPowerControlWithFeedback;
-                    if (dispTwoWay != null)
-                    {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
-
-                        if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                        {
-                            SetDefaultLevels();
-                        }
-                    }
-
-                    display.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
-                    display.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
-
-                    display.IsCoolingDownFeedback.OutputChange -= IsCoolingDownFeedback_OutputChange;
-                    display.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
-
-                }
-            }
-        }
-
-        void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            IsCoolingDownFeedback.FireUpdate();
-        }
-
-        void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            IsWarmingUpFeedback.FireUpdate();
-            if (!IsWarmingUpFeedback.BoolValue)
-                (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-        }
-
-        void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            var dispTwoWay = sender as IHasPowerControlWithFeedback;
-            
-            if (dispTwoWay != null && dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-            {
-                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                //    CurrentSourceInfo = null;
-                OnFeedback.FireUpdate();
-            }
-        }
-
-
-
-
-
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
-            }
-
-            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()
         {
             try
             {
@@ -437,37 +267,110 @@ namespace PepperDash.Essentials
 
                 Debug.Console(2, this, "Emergency Config evaluated.");
 
+
+                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+                VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); };
+
                 if (AudioCodec != null)
-                {
+                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-                    AudioCodec.CallStatusChange -= AudioCodec_CallStatusChange;
-                    AudioCodec.CallStatusChange += AudioCodec_CallStatusChange;
-                }
-
-                VideoCodec.CallStatusChange -= VideoCodec_CallStatusChange;
-                VideoCodec.CallStatusChange += VideoCodec_CallStatusChange;
-
-                VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
-                VideoCodec.IsReadyChange += VideoCodec_IsReadyChange;
-
-                VideoCodec.SharingContentIsOnFeedback.OutputChange -= SharingContentIsOnFeedback_OutputChange;
-                VideoCodec.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
-
 
                 IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
                 // link privacy to VC (for now?)
                 PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error Initializing Room: {0}", e);
+            }
+        }
 
+        private void SetupDisplays()
+        {
+            //DefaultDisplay = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultDisplayKey) as IRoutingSinkWithSwitching;
 
+            var destinationList = ConfigReader.ConfigObject.DestinationLists[PropertiesConfig.DestinationListKey];
+
+            foreach (var destination in destinationList)
+            {
+                var dest = destination.Value.SinkDevice as IRoutingSinkWithSwitching;
+
+                if (dest != null)
+                {
+                    Displays.Add(dest);
+                }
+
+                var display = dest as DisplayBase;
+                if (display != null)
+                {
+                    // Link power, warming, cooling to display
+                    var dispTwoWay = display as IHasPowerControlWithFeedback;
+                    if (dispTwoWay != null)
+                    {
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
+                        {
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                            {
+                                //if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                                //    CurrentSourceInfo = null;
+                                OnFeedback.FireUpdate();
+                            }
+                            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+                            {
+                                SetDefaultLevels();
+                            }
+                        };
+                    }
+
+                    display.IsWarmingUpFeedback.OutputChange += (o, a) =>
+                    {
+                        IsWarmingUpFeedback.FireUpdate();
+                        if (!IsWarmingUpFeedback.BoolValue)
+                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                    };
+                    display.IsCoolingDownFeedback.OutputChange += (o, a) =>
+                    {
+                        IsCoolingDownFeedback.FireUpdate();
+                    };
+
+                }
+            }
+        }
+
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+            SetCodecExternalSources();
+        }
+
+        protected override void CustomSetConfig(DeviceConfig config)
+        {
+            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
+
+            if (newPropertiesConfig != null)
+                PropertiesConfig = newPropertiesConfig;
+
+            ConfigWriter.UpdateRoomConfig(config);
+        }
+
+        public override bool CustomActivate()
+        {
             // Add Occupancy object from config
             if (PropertiesConfig.Occupancy != null)
             {
@@ -482,48 +385,9 @@ namespace PepperDash.Essentials
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
 
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error Activiating Room: {0}", e);
-            }
-
             return base.CustomActivate();
         }
 
-        void AudioCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
-        {
-            InCallFeedback.FireUpdate();
-        }
-
-        void PrivacyModeIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            PrivacyModeIsOnFeedback.FireUpdate();
-        }
-
-        void VideoCodec_IsReadyChange(object sender, EventArgs e)
-        {
-            SetUpVideoCodec();
-        }
-
-        void SetUpVideoCodec()
-        {
-            SetCodecExternalSources();
-            SetCodecBranding();
-        }
-
-        void VideoCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
-        {
-            InCallFeedback.FireUpdate();
-        }
-
-        void SharingContentIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            IsSharingFeedback.FireUpdate();
-        }
-
-
-
         /// <summary>
         /// 
         /// </summary>

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,59 +242,7 @@ 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);
-            }
-
-			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()
 		{
             try
             {
@@ -332,15 +278,32 @@ namespace PepperDash.Essentials
                     var dispTwoWay = disp as IHasPowerControlWithFeedback;
                     if (dispTwoWay != null)
                     {
-                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += (o, a) =>
-                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange; 
+                            {
+                                if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+                                {
+                                    if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                                        CurrentSourceInfo = null;
+                                    OnFeedback.FireUpdate();
+                                }
+                                if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+                                {
+                                    SetDefaultLevels();
+                                }
+                            };
                     }
 
-                    disp.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
+                    disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
-                    disp.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;
+                    {
+                        IsWarmingUpFeedback.FireUpdate();
+                        if (!IsWarmingUpFeedback.BoolValue)
+                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+                    };
+                    disp.IsCoolingDownFeedback.OutputChange += (o, a) =>
+                    {
+                        IsCoolingDownFeedback.FireUpdate();
+                    };
 
-                    disp.IsCoolingDownFeedback.OutputChange -= IsCoolingDownFeedback_OutputChange;
-                    disp.IsCoolingDownFeedback.OutputChange += IsCoolingDownFeedback_OutputChange;
                 }
 
 
@@ -355,29 +318,19 @@ namespace PepperDash.Essentials
 
                 Debug.Console(2, this, "Emergency Config evaluated.");
 
+
+                VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
+				VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); }; 
+
                 if (AudioCodec != null)
-                {
+                    AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-                    AudioCodec.CallStatusChange -= AudioCodec_CallStatusChange;
-                    AudioCodec.CallStatusChange += AudioCodec_CallStatusChange;
-                }
-
-                VideoCodec.CallStatusChange -= VideoCodec_CallStatusChange;
-                VideoCodec.CallStatusChange += VideoCodec_CallStatusChange;
-
-                VideoCodec.IsReadyChange -= VideoCodec_IsReadyChange;
-                VideoCodec.IsReadyChange += VideoCodec_IsReadyChange;
-
-                VideoCodec.SharingContentIsOnFeedback.OutputChange -= SharingContentIsOnFeedback_OutputChange;
-                VideoCodec.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
-
 
                 IsSharingFeedback = new BoolFeedback(() => VideoCodec.SharingContentIsOnFeedback.BoolValue);
+                VideoCodec.SharingContentIsOnFeedback.OutputChange += (o, a) => this.IsSharingFeedback.FireUpdate();
 
                 // link privacy to VC (for now?)
                 PrivacyModeIsOnFeedback = new BoolFeedback(() => VideoCodec.PrivacyModeIsOnFeedback.BoolValue);
-
+                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += (o, a) => this.PrivacyModeIsOnFeedback.FireUpdate();
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
-                VideoCodec.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
 
                 CallTypeFeedback = new IntFeedback(() => 0);
 
@@ -386,8 +339,55 @@ namespace PepperDash.Essentials
                 SetSourceListKey();
 
                 EnablePowerOnToLastSource = true;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, this, "Error Initializing Room: {0}", e);
+            }
+   		}
+
+        private void SetupEnvironmentalControlDevices()
+        {
+            if (PropertiesConfig.Environment != null)
+            {
+                if (PropertiesConfig.Environment.Enabled)
+                {
+                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
+                    {
+                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
+                        EnvironmentalControlDevices.Add(envDevice);
+                    }
+                }
+            }
+        }
 
 
+        private void SetSourceListKey()
+        {
+            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
+            {
+                SetSourceListKey(PropertiesConfig.SourceListKey);
+            }
+            else
+            {
+                SetSourceListKey(Key);
+            }
+
+			SetCodecExternalSources();
+        }
+
+        protected override void CustomSetConfig(DeviceConfig config)
+        {
+            var newPropertiesConfig = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>(config.Properties.ToString());
+
+            if (newPropertiesConfig != null)
+                PropertiesConfig = newPropertiesConfig;
+
+            ConfigWriter.UpdateRoomConfig(config);
+        }
+
+        public override bool CustomActivate()
+        {
             // Add Occupancy object from config
             if (PropertiesConfig.Occupancy != null)
             {
@@ -401,76 +401,10 @@ namespace PepperDash.Essentials
 
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, this, "Error Activiating Room: {0}", e);
-            }
 			
             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/Comm and IR/GenericHttpClient.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.ComponentModel;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharp.Net.Http;
+using Crestron.SimplSharp.Ssh;
+using Crestron.SimplSharpPro.EthernetCommunication;
 using PepperDash.Core;
-using PepperDash.Core.DebugThings;
 
 namespace PepperDash.Essentials.Core
 {
@@ -17,52 +16,130 @@ namespace PepperDash.Essentials.Core
 		public GenericHttpClient(string key, string name, string hostname)
 			: base(key, name)
 		{
-			Client = new HttpClient();
+			Client = new HttpClient {HostName = hostname};
-			Client.HostName = hostname;
+		}
-			
 
+	    public GenericHttpClient(string key, string name, string hostname, GenericHttpClientConnectionOptions options)
+	        : base(key, name)
+	    {
+	        Client = new HttpClient
+	        {
+	            HostName = hostname,
+	            Accept = options.Accept,
+	            KeepAlive = options.KeepAlive,
+	            Password = options.Password,
+	            Timeout = options.Timeout,
+	            TimeoutEnabled = options.TimeoutEnabled,
+	            UserAgent = options.UserAgent,
+	            UserName = options.UserName,
+	            Version = options.Version
+	        };
+	        if (options.Port > 0) Client.Port = options.Port;
 	    }
 
 	    /// <summary>
-		/// 
+		/// Send a HTTP Get Request to a client
 		/// </summary>
-		/// <param name="path"></param>
+		/// <param name="path">Path to request node</param>
         public void SendText(string path)
         {
-			HttpClientRequest request = new HttpClientRequest();
+            var url = string.Format("http://{0}/{1}", Client.HostName, path);
-			string url = string.Format("http://{0}/{1}", Client.HostName, path);
+            var request = new HttpClientRequest()
-			request.Url = new UrlParser(url);
-			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
-		}
-		public void SendText(string format, params object[] items)
             {
-			HttpClientRequest request = new HttpClientRequest();
+                Url = new UrlParser(url)
-			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+            };
-			request.Url = new UrlParser(url);
+            var error = Client.DispatchAsyncEx(request, Response, request);
-			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
         }
 
+        /// <summary>
+        /// Send a HTTP Get Request to a client using a formatted string
+        /// </summary>
+        /// <param name="format">Path</param>
+        /// <param name="items">Parameters for Path String Formatting</param>
+        public void SendText(string format, params object[] items)
+        {
+            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+            var request = new HttpClientRequest()
+            {
+                Url = new UrlParser(url)
+            };
+            var error = Client.DispatchAsyncEx(request, Response, request);
+        }
+
+        /// <summary>
+        /// Send a unidirectional HTTP Get Request to a client using a formatted string
+        /// </summary>
+        /// <param name="format">Path</param>
+        /// <param name="items">Parameters for Path String Formatting</param>
         public void SendTextNoResponse(string format, params object[] items)
         {
-			HttpClientRequest request = new HttpClientRequest();
+            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
-			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+            var request = new HttpClientRequest()
-			request.Url = new UrlParser(url);
+            {
+                Url = new UrlParser(url)
+            };
+            Client.Dispatch(request);
+        }
+
+        /// <summary>
+        /// Send an HTTP Request of a specific request type
+        /// </summary>
+        /// <param name="requestType">HTTP Request Type</param>
+        /// <param name="path">Path to request node</param>
+        public void SendText(RequestType requestType, string path)
+        {
+            var url = string.Format("http://{0}/{1}", Client.HostName, path);
+            var request = new HttpClientRequest()
+            {
+                Url = new UrlParser(url),
+                RequestType = requestType
+            };
+            var error = Client.DispatchAsyncEx(request, Response, request);
+        }
+
+        /// <summary>
+        /// Send an HTTP Request of a specific request type using a formatted string
+        /// </summary>
+        /// <param name="requestType">HTTP Request Type</param>
+        /// <param name="format">Path</param>
+        /// <param name="items">Parameters for Path String Formatting</param>
+        public void SendText(RequestType requestType, string format, params object[] items)
+        {
+            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+            var request = new HttpClientRequest()
+            {
+                Url = new UrlParser(url),
+                RequestType = requestType
+            };
+            var error = Client.DispatchAsyncEx(request, Response, request);
+        }
+
+        /// <summary>
+        /// Send a unidirectional HTTP Request of a specific request type using a formatted string
+        /// </summary>
+        /// <param name="requestType">HTTP Request Type</param>
+        /// <param name="format">Path</param>
+        /// <param name="items">Parameters for Path String Formatting</param>
+        public void SendTextNoResponse(RequestType requestType, string format, params object[] items)
+        {
+            var url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
+            var request = new HttpClientRequest()
+            {
+                Url = new UrlParser(url)
+            };
             Client.Dispatch(request);
         }
 
 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
 		{
-			if (error == HTTP_CALLBACK_ERROR.COMPLETED)
+		    if (error != HTTP_CALLBACK_ERROR.COMPLETED) return;
-			{
 		    var responseReceived = response;
 
-				if (responseReceived.ContentString.Length > 0)
+		    if (responseReceived.ContentString.Length <= 0) return;
-				{
+		    if (ResponseRecived == null) return;
-					if (ResponseRecived != null)
+		    var httpClientRequest = request as HttpClientRequest;
-						ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
+		    if (httpClientRequest != null)
-				}
+		        ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, httpClientRequest.Url.ToString(), error));
-			}
-
 		}
 
 
@@ -100,6 +177,8 @@ namespace PepperDash.Essentials.Core
 
 		#endregion
 	}
+
+
 	public class GenericHttpClientEventArgs : EventArgs
 	{
 		public string ResponseText { get; private set; }
@@ -112,4 +191,84 @@ namespace PepperDash.Essentials.Core
 			Error = error;
 		}
 	}
+
+    /// <summary>
+    /// Objedct to set parameters for HTTP Requests
+    /// </summary>
+    public class GenericHttpClientConnectionOptions
+    {
+        /// <summary>
+        ///     Gets or sets content types that are acceptable for the response. The default
+        ///     value is "text/html, image/gif, image/jpeg, image/png, */*".
+        /// </summary>
+        [DefaultValue("text/html, image/gif, image/jpeg, image/png")]
+        public string Accept { get; set; }
+
+        /// <summary>
+        ///     Controls whether to use HTTP Keep-Alive to keep the connection alive between
+        ///     requests. If enabled (true) , once a request is made and a connection is
+        ///     established, this connection is kept open and used for future requests. If
+        ///     disabled, the connection is closed, and a new connection is created for future
+        ///     requests.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool KeepAlive { get; set; }
+
+        /// <summary>
+        ///     This property controls whether the request operation will do an automatic
+        ///     timeout checking. If timeout handling is turned on (i.e. this property is
+        ///     set to true) and a request takes longer than Timeout, it will be terminated.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool TimeoutEnabled { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the maximum amount of time (in seconds) that a client will wait
+        ///     for a server response within a single request. The default value is 60 seconds
+        ///     (1 minute).  The timeout handling can be activated via the TimeoutEnabled
+        ///     property.
+        /// </summary>
+        [DefaultValue(60)]
+        public int Timeout { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the version identifier of the UserAgent. Can be used to mimic
+        ///     particular browsers like Internet Explorer 6.0
+        /// </summary>
+        [DefaultValue("1.1")]
+        public string Version { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the identifier of the software being used to retrieve data via
+        ///     the URL. Some custom HTTP servers check this HTTP header to provide content
+        ///     optimized for particular HTTP browsers.
+        /// </summary>
+        [DefaultValue("Crestron SimplSharp HTTP Client")]
+        public string UserAgent { get; set; }
+
+        /// <summary>
+        ///    Name that will be inserted into the Authorization HTTP header in the request
+        ///    to the server.
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        ///     Password that will be inserted into the Authorization HTTP header in the
+        ///     request to the server.
+        /// </summary>
+        public string Password { get; set; }
+
+        /// <summary>
+        ///     The server Port that you intend the client to connect to.  If you do not
+        ///     assign a port number on this property, the port number in the parsed URL
+        ///     will be used. If a port number is assigned in the parsed URL, it will take
+        ///     precedence over this property.
+        /// </summary>
+        /// <remarks>
+        ///     If you do not assign a port number on this property, the port number in the
+        ///     parsed URL will be used.
+        /// </remarks>
+        /// 
+        public int Port { get; set; }
+    }
 }

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

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

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

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

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

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