Merge branch 'development' into hotfix/vtc-room-activation-deactivation-changes

Minor adjustments and added debug messages
Additional updates to allow occupancy sensor to be cleared when room not active
2026-02-02 22:34:57 +00:00 · 2023-07-21 12:22:58 -06:00 · 2023-07-19 16:55:53 -06:00 · 2023-07-19 16:22:20 -06:00 · 2023-07-19 15:28:24 -06:00 · 2023-07-19 09:50:48 -06:00
23 changed files with 686 additions and 375 deletions
--- a/.github/workflows/add-issues-to-project.yml
+++ b/.github/workflows/add-issues-to-project.yml
@@ -1,37 +0,0 @@
-name: Add bugs to bugs project
-
-on:
-  issues:
-    types:
-      - opened
-      - labeled
-      
-jobs:
-  check-secret:
-    runs-on: ubuntu-latest
-    outputs:
-      my-key: ${{ steps.my-key.outputs.defined }}
-    steps:
-        - id: my-key
-          if: "${{ env.MY_KEY != '' }}"
-          run: echo "::set-output name=defined::true"
-          env:
-              MY_KEY: ${{ secrets.PROJECT_URL }}
-  throw-error: 
-    name: Check
-    runs-on: ubuntu-latest
-    needs: [check-secret]
-    if: needs.check-secret.outputs.my-key != 'true'
-    steps:
-      - run: echo "The Project URL Repo Secret is empty"
-  add-to-project:
-    name: Add issue to project
-    runs-on: ubuntu-latest
-    needs: [check-secret]
-    if: needs.check-secret.outputs.my-key == 'true'
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: ${{ secrets.PROJECT_URL }}
-          github-token: ${{ secrets.GH_PROJECTS_PASSWORD }}
-
--- a/.gitignore
+++ b/.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
--- a/PepperDashEssentials/ControlSystem.cs
+++ b/PepperDashEssentials/ControlSystem.cs
@@ -93,27 +93,28 @@ namespace PepperDash.Essentials
            CrestronConsole.AddNewConsoleCommand(s =>
            {
                foreach (var tl in TieLineCollection.Default)
-                    CrestronConsole.ConsoleCommandResponse("  {0}\r\n", tl);
+                    CrestronConsole.ConsoleCommandResponse("  {0}{1}", tl, CrestronEnvironment.NewLine);
            },
            "listtielines", "Prints out all tie lines", ConsoleAccessLevelEnum.AccessOperator);

            CrestronConsole.AddNewConsoleCommand(s =>
            {
                CrestronConsole.ConsoleCommandResponse
-                    ("Current running configuration. This is the merged system and template configuration");
+                    ("Current running configuration. This is the merged system and template configuration" + CrestronEnvironment.NewLine);
                CrestronConsole.ConsoleCommandResponse(Newtonsoft.Json.JsonConvert.SerializeObject
                    (ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented));
            }, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);

-            CrestronConsole.AddNewConsoleCommand(s => 
+            CrestronConsole.AddNewConsoleCommand(s =>
                CrestronConsole.ConsoleCommandResponse(
-                "This system can be found at the following URLs:\r\n" +
-                "System URL:   {0}\r\n" +
-                "Template URL: {1}", 
-                ConfigReader.ConfigObject.SystemUrl, 
-                ConfigReader.ConfigObject.TemplateUrl), 
-                "portalinfo", 
-                "Shows portal URLS from configuration", 
+                "This system can be found at the following URLs:{2}" +
+                "System URL:   {0}{2}" +
+                "Template URL: {1}{2}",
+                ConfigReader.ConfigObject.SystemUrl,
+                ConfigReader.ConfigObject.TemplateUrl,
+                CrestronEnvironment.NewLine),
+                "portalinfo",
+                "Shows portal URLS from configuration",
                ConsoleAccessLevelEnum.AccessOperator);


--- a/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
@@ -226,66 +226,66 @@ namespace PepperDash.Essentials
            }
        }

-        void Initialize()
+        public override void Initialize()
        {
            try
            {
-                if (DefaultAudioDevice is IBasicVolumeControls)
-                    DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
-                else if (DefaultAudioDevice is IHasVolumeDevice)
-                    DefaultVolumeControls = (DefaultAudioDevice as IHasVolumeDevice).VolumeDevice;
-                CurrentVolumeControls = DefaultVolumeControls;
+                //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,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) =>
-                        {
-                            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();
-                    };
+                    {
+                        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))
@@ -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
-            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);
-
+        {
+            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);
+            }
+
+
+            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)
            {
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/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) =>
-                            {
-                                if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
-                                {
-                                    if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                        CurrentSourceInfo = null;
-                                    OnFeedback.FireUpdate();
-                                }
-                                if (dispTwoWay.PowerIsOnFeedback.BoolValue)
-                                {
-                                    SetDefaultLevels();
-                                }
-                            };
+                        dispTwoWay.PowerIsOnFeedback.OutputChange -= PowerIsOnFeedback_OutputChange;
+                        dispTwoWay.PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange; 
                    }

-                    disp.IsWarmingUpFeedback.OutputChange += (o, a) =>
-                    {
-                        IsWarmingUpFeedback.FireUpdate();
-                        if (!IsWarmingUpFeedback.BoolValue)
-                            (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
-                    };
-                    disp.IsCoolingDownFeedback.OutputChange += (o, a) =>
-                    {
-                        IsCoolingDownFeedback.FireUpdate();
-                    };
+                    disp.IsWarmingUpFeedback.OutputChange -= IsWarmingUpFeedback_OutputChange;
+                    disp.IsWarmingUpFeedback.OutputChange += IsWarmingUpFeedback_OutputChange;

+                    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);
-            }
-   		}
-
-        private void SetupEnvironmentalControlDevices()
-        {
-            if (PropertiesConfig.Environment != null)
-            {
-                if (PropertiesConfig.Environment.Enabled)
-                {
-                    foreach (var d in PropertiesConfig.Environment.DeviceKeys)
-                    {
-                        var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
-                        EnvironmentalControlDevices.Add(envDevice);
-                    }
-                }
-            }
-        }
-
-
-        private void SetSourceListKey()
-        {
-            if (!string.IsNullOrEmpty(PropertiesConfig.SourceListKey))
-            {
-                SetSourceListKey(PropertiesConfig.SourceListKey);
-            }
-            else
-            {
-                SetSourceListKey(Key);
+                Debug.Console(0, this, "Error Activiating Room: {0}", e);
            }

-			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);
-			
+            Debug.Console(0, this, "Room '{0}' Activated", Name);
            return base.CustomActivate();
        }

+        void PrivacyModeIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            PrivacyModeIsOnFeedback.FireUpdate();
+        }
+
+        void SharingContentIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsSharingFeedback.FireUpdate();
+        }
+
+        void AudioCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            InCallFeedback.FireUpdate();
+        }
+
+        void VideoCodec_IsReadyChange(object sender, EventArgs e)
+        {
+            SetUpVideoCodec();
+        }
+
+        void SetUpVideoCodec()
+        {
+            SetCodecExternalSources();
+            SetCodecBranding();
+        }
+
+        void VideoCodec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
+        {
+            InCallFeedback.FireUpdate();
+        }
+
+        void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsCoolingDownFeedback.FireUpdate();
+        }
+
+        void IsWarmingUpFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            IsWarmingUpFeedback.FireUpdate();
+            if (!IsWarmingUpFeedback.BoolValue)
+                (CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(DefaultVolume);
+        
+        }
+
+        void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            var dispTwoWay = DefaultDisplay as IHasPowerControlWithFeedback;
+
+            if (dispTwoWay.PowerIsOnFeedback.BoolValue != OnFeedback.BoolValue)
+            {
+                if (!dispTwoWay.PowerIsOnFeedback.BoolValue)
+                    CurrentSourceInfo = null;
+                OnFeedback.FireUpdate();
+            }
+            if (dispTwoWay.PowerIsOnFeedback.BoolValue)
+            {
+                SetDefaultLevels();
+            }
+            
+        }
+
        

        /// <summary>
@@ -832,6 +904,8 @@ namespace PepperDash.Essentials
                        videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
                    }
                }
+                Debug.Console(1, this, "Successfully set up codec external sources for room: {0}", Name);
+
            }
            catch (Exception e)
            {
--- a/Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
+++ b/Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
@@ -165,7 +165,7 @@ namespace PepperDash.Essentials.Core.Bridges

                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);

-                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
+                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                {
                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
@@ -409,7 +409,7 @@ namespace PepperDash.Essentials.Core.Bridges
        public List<ApiDevicePropertiesConfig> Devices { get; set; }

        [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; }


        public class ApiDevicePropertiesConfig
@@ -442,7 +442,7 @@ namespace PepperDash.Essentials.Core.Bridges
    {
        public EiscApiAdvancedFactory()
        {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
        }

        public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -457,34 +457,34 @@ namespace PepperDash.Essentials.Core.Bridges
            {
                case "eiscapiadv":
                case "eiscapiadvanced":
-                {
-                    eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
-                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                    break;
-                }
-                case "eiscapiadvancedserver":
-                {
-                    eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                    break;
-                }
-                case "eiscapiadvancedclient":
-                {
-                    eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                    break;
-                }
-                case "vceiscapiadv":
-                case "vceiscapiadvanced":
-                {
-                    if (string.IsNullOrEmpty(controlProperties.RoomId))
                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
-                        eisc = null;
+                        eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                        break;
+                    }
+                case "eiscapiadvancedserver":
+                    {
+                        eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                        break;
+                    }
+                case "eiscapiadvancedclient":
+                    {
+                        eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                        break;
+                    }
+                case "vceiscapiadv":
+                case "vceiscapiadvanced":
+                    {
+                        if (string.IsNullOrEmpty(controlProperties.RoomId))
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
+                            eisc = null;
+                            break;
+                        }
+                        eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                            Global.ControlSystem);
                        break;
                    }
-                    eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
-                        Global.ControlSystem);
-                    break;
-                }
                default:
                    eisc = null;
                    break;
--- a/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
@@ -379,28 +379,28 @@ namespace PepperDash.Essentials.Core
        /// Prints a list of routing inputs and outputs by device key.
        /// </summary>
        /// <param name="s">Device key from which to report data</param>
-	    public static void GetRoutingPorts(string s)
-	    {
-	        var device = GetDeviceForKey(s);
+        public static void GetRoutingPorts(string s)
+        {
+            var device = GetDeviceForKey(s);

            if (device == null) return;
            var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
            var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
-	        if (inputPorts != null)
-	        {
-                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:", s, inputPorts.Count);
-	            foreach (var routingInputPort in inputPorts)
-	            {
-                    CrestronConsole.ConsoleCommandResponse("{0}", routingInputPort.Key);
-	            }
-	        }
+            if (inputPorts != null)
+            {
+                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:{2}", s, inputPorts.Count, CrestronEnvironment.NewLine);
+                foreach (var routingInputPort in inputPorts)
+                {
+                    CrestronConsole.ConsoleCommandResponse("{0}{1}", routingInputPort.Key, CrestronEnvironment.NewLine);
+                }
+            }
            if (outputPorts == null) return;
-            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:", s, outputPorts.Count);
+            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:{2}", s, outputPorts.Count, CrestronEnvironment.NewLine);
            foreach (var routingOutputPort in outputPorts)
            {
-                CrestronConsole.ConsoleCommandResponse("{0}", routingOutputPort.Key);
+                CrestronConsole.ConsoleCommandResponse("{0}{1}", routingOutputPort.Key, CrestronEnvironment.NewLine);
            }
-	    }
+        }

        /// <summary>
        /// Attempts to set the debug level of a device
--- a/Core/PepperDashEssentialsBase/Devices/PduInterfaces.cs
+++ b/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>
--- a/Core/PepperDashEssentialsBase/Devices/PowerInterfaces.cs
+++ b/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; }
+
+    }
+
+
+
+}
--- a/Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs
+++ b/Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs
@@ -175,8 +175,8 @@ namespace PepperDash.Essentials.Core
        /// <param name="filter"></param>
        public static void GetDeviceFactoryTypes(string filter)
        {
-            var types = !string.IsNullOrEmpty(filter) 
-                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value) 
+            var types = !string.IsNullOrEmpty(filter)
+                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value)
                : FactoryMethods;

            CrestronConsole.ConsoleCommandResponse("Device Types:");
@@ -186,12 +186,12 @@ namespace PepperDash.Essentials.Core
                var description = type.Value.Description;
                var cType = "Not Specified by Plugin";

-                if(type.Value.CType != null)
+                if (type.Value.CType != null)
                {
                    cType = type.Value.CType.FullName;
                }

-                CrestronConsole.ConsoleCommandResponse( 
+                CrestronConsole.ConsoleCommandResponse(
                    @"Type: '{0}' 
                    CType: '{1}' 
                    Description: {2}", type.Key, cType, description);
--- a/Core/PepperDashEssentialsBase/File/FileIO.cs
+++ b/Core/PepperDashEssentialsBase/File/FileIO.cs
@@ -21,35 +21,37 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		/// <param name="fileName"></param>
 		/// <returns></returns>
-		public static FileInfo[] GetFiles(string fileName)
-		{
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
-			if (files.Count() > 0)
-			{
-				return files;
-			}
-			else
-			{
-				return null;
-			}
-		}
+        public static FileInfo[] GetFiles(string fileName)
+        {
+            string fullFilePath = Global.FilePathPrefix + fileName;
+            DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath));
+            var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath));
+            Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fullFilePath);
+            if (files.Count() > 0)
+            {
+                return files;
+            }
+            else
+            {
+                return null;
+            }
+        }

-		public static FileInfo GetFile(string fileName)
-		{
-			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
-			var files = dirInfo.GetFiles(Path.GetFileName(fileName));
-			Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fileName);
-			if (files.Count() > 0)
-			{
-				return files.FirstOrDefault();
-			}
-			else
-			{
-				return null;
-			}
-		}
+        public static FileInfo GetFile(string fileName)
+        {
+            string fullFilePath = Global.FilePathPrefix + fileName;
+            DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath));
+            var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath));
+            Debug.Console(0, "FileIO found: {0}, {1}", files.Count(), fullFilePath);
+            if (files.Count() > 0)
+            {
+                return files.FirstOrDefault();
+            }
+            else
+            {
+                return null;
+            }
+        }


 		/// <summary>
@@ -81,7 +83,7 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
+					DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName);
 					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);

 					if (File.Exists(file.FullName))
@@ -202,7 +204,7 @@ namespace PepperDash.Essentials.Core
 		public static void WriteDataToFile(string data, string filePath)
 		{
 			Thread _WriteFileThread;
-			_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
+            _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");
@@ -217,7 +219,8 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					using (StreamWriter sw = new StreamWriter(filePath))
+
+                    using (StreamWriter sw = new StreamWriter(filePath))
 					{
 						sw.Write(data);
 						sw.Flush();
--- a/Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs
+++ b/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, "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");
-	        }
+	        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");
+            }

 	    }

--- a/Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorPropertiesConfig.cs
+++ b/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; }
    }
 }
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/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" />
--- a/Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
+++ b/Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
@@ -195,13 +195,12 @@ namespace PepperDash.Essentials
        public static void ReportAssemblyVersions(string command)
        {

-            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:");
+            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:" + CrestronEnvironment.NewLine);
            foreach (var assembly in LoadedAssemblies)
            {
-                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}", assembly.Name, assembly.Version);
+                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}" + CrestronEnvironment.NewLine, assembly.Name, assembly.Version);
            }
        }
-
        /// <summary>
        /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
        /// </summary>
--- a/Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs
+++ b/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; }

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

--- a/DM/Essentials_DM/Chassis/DmChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmChassisController.cs
@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.DM
    /// 
    /// </summary>
    [Description("Wrapper class for all DM-MD chassis variants from 8x8 to 32x32")]
-    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitch, IRoutingNumericWithFeedback
+    public class DmChassisController : CrestronGenericBridgeableBaseDevice, IDmSwitchWithEndpointOnlineFeedback, IRoutingNumericWithFeedback
    {
        private const string NonePortKey = "inputCard0--None";
        public DMChassisPropertiesConfig PropertiesConfig { get; set; }
--- a/DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
+++ b/DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
@@ -436,9 +436,9 @@ namespace PepperDash.Essentials.DM
                }
                return rx;
            }
-            else if (parentDev is DmChassisController)
+            else if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
            {
-                var controller = parentDev as DmChassisController;
+                var controller = parentDev as IDmSwitchWithEndpointOnlineFeedback;
                var chassis = controller.Chassis;
                var num = props.ParentOutputNumber;
                Debug.Console(1, "Creating DM Chassis device '{0}'. Output number '{1}'.", key, num);
--- a/DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs
@@ -121,7 +121,7 @@ namespace PepperDash.Essentials.DM

            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.DisplayPortInput.InputStreamChange += DisplayPortInputStreamChange;
+            Tx.DisplayPortInput.InputStreamChange += InputStreamChangeEvent;
            Tx.BaseEvent += Tx_BaseEvent;
            Tx.OnlineStatusChange += Tx_OnlineStatusChange;

@@ -131,8 +131,7 @@ namespace PepperDash.Essentials.DM
            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);

            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
-            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortHdcpCapability",
+            DisplayPortInHdcpCapabilityFeedback = new IntFeedback("DisplayPortInHdcpCapability",
                () => (int)tx.DisplayPortInput.HdcpCapabilityFeedback);


@@ -171,13 +170,19 @@ namespace PepperDash.Essentials.DM
                    (ActualActiveVideoInput == eVst.Hdmi1
                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.DisplayPort
+                    && tx.DisplayPortInput.VideoAttributes.HdcpActiveFeedback.BoolValue),

                HdcpStateFeedbackFunc = () =>
                {
                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    return ActualActiveVideoInput == eVst.Hdmi2 ? tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString() : "";
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString(); 
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
+                    return ActualActiveVideoInput == eVst.DisplayPort
+                        ? tx.DisplayPortInput.VideoAttributes.HdcpStateFeedback.ToString()
+                        : "";
                },

                VideoResolutionFeedbackFunc = () =>
@@ -186,6 +191,8 @@ namespace PepperDash.Essentials.DM
                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
                    if (ActualActiveVideoInput == eVst.Hdmi2)
                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
+                    if (ActualActiveVideoInput == eVst.DisplayPort)
+                        return tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString();
                    return ActualActiveVideoInput == eVst.Vga ? tx.DisplayPortInput.VideoAttributes.GetVideoResolutionString() : "";
                },
                VideoSyncFeedbackFunc = () =>
@@ -193,6 +200,8 @@ namespace PepperDash.Essentials.DM
                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
                    || (ActualActiveVideoInput == eVst.Hdmi2
                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
+                    || (ActualActiveVideoInput == eVst.DisplayPort
+                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)
                    || (ActualActiveVideoInput == eVst.Vga
                    && tx.DisplayPortInput.SyncDetectedFeedback.BoolValue)

@@ -211,28 +220,15 @@ namespace PepperDash.Essentials.DM
                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback);
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback, DisplayPortVideoSyncFeedback, DisplayPortInHdcpCapabilityFeedback);

-            // Set Ports for CEC
            HdmiIn1.Port = Tx.HdmiInputs[1];
            HdmiIn2.Port = Tx.HdmiInputs[2];
+            DisplayPortIn.Port = Tx.DisplayPortInput;
            HdmiLoopOut.Port = Tx.HdmiOutput;
            DmOut.Port = Tx.DmOutput;
        }

-        void DisplayPortInputStreamChange(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
-        {
-            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
-
-            switch (args.EventId)
-            {
-                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
-                    DisplayPortVideoSyncFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-

        public override bool CustomActivate()
        {
@@ -344,11 +340,17 @@ namespace PepperDash.Essentials.DM
                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
+                    if (inputStream == Tx.DisplayPortInput) DisplayPortInHdcpCapabilityFeedback.FireUpdate();
+
+                    Debug.Console(2, this, "DisplayPortHDCP Mode Trigger = {0}",
+                        DisplayPortInHdcpCapabilityFeedback.IntValue);
+
                    HdcpStateFeedback.FireUpdate();
                    break;
                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
+                    if (inputStream == Tx.DisplayPortInput) DisplayPortVideoSyncFeedback.FireUpdate();
                    break;
            }
        }
--- a/DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -44,7 +42,7 @@ namespace PepperDash.Essentials.DM
            if (typeName.StartsWith("dmtx401"))
                return new DmTx401CController(key, name, new DmTx401C(dmInput), true);
            if (typeName.StartsWith("hdbasettx"))
-                new HDBaseTTxController(key, name, new HDTx3CB(dmInput));
+                return new HDBaseTTxController(key, name, new HDTx3CB(dmInput));

            return null;
        }
@@ -83,6 +81,7 @@ namespace PepperDash.Essentials.DM
        /// <param name="key"></param>
        /// <param name="name"></param>
        /// <param name="props"></param>
+        /// <param name="typeName"></param>
        /// <returns></returns>
        public static BasicDmTxControllerBase GetDmTxController(string key, string name, string typeName, DmTxPropertiesConfig props)
        {
@@ -128,10 +127,10 @@ namespace PepperDash.Essentials.DM
            BasicDmTxControllerBase tx;
            bool useChassisForOfflineFeedback = false;

-            if (parentDev is DmChassisController)
+            if (parentDev is IDmSwitchWithEndpointOnlineFeedback)
            {
                // Get the Crestron chassis and link stuff up
-                var switchDev = (parentDev as DmChassisController);
+                var switchDev = (parentDev as IDmSwitchWithEndpointOnlineFeedback);
                var chassis = switchDev.Chassis;

                //Check that the input is within range of this chassis' possible inputs
@@ -180,7 +179,8 @@ namespace PepperDash.Essentials.DM
                    return null;
                }
            }
-            else if (parentDev is DmpsRoutingController)
+
+            if (parentDev is DmpsRoutingController)
            {
                // Get the DMPS chassis and link stuff up
                var dmpsDev = (parentDev as DmpsRoutingController);
@@ -237,11 +237,8 @@ namespace PepperDash.Essentials.DM
                }
            }

-            else
-            {
-                Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
-                return null;
-            }
+            Debug.Console(0, "Cannot create DM device '{0}'. '{1}' is not a processor, DM Chassis or DMPS.", key, pKey);
+            return null;
        }
    }

@@ -336,8 +333,6 @@ namespace PepperDash.Essentials.DM
                txR.VideoSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.VideoInput.JoinNumber]);
                txR.AudioSourceNumericFeedback.LinkInputSig(trilist.UShortInput[joinMap.AudioInput.JoinNumber]);

-                trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)tx.HdcpSupportCapability;
-
                if (txR.InputPorts[DmPortName.HdmiIn] != null)
                {
                    var inputPort = txR.InputPorts[DmPortName.HdmiIn];
@@ -384,7 +379,7 @@ namespace PepperDash.Essentials.DM
                    {
                        var intFeedback = tx.Feedbacks["HdmiIn2HdcpCapability"] as IntFeedback;
                        if (intFeedback != null)
-                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port1HdcpState.JoinNumber]);
+                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port2HdcpState.JoinNumber]);
                    }

                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
@@ -401,16 +396,17 @@ namespace PepperDash.Essentials.DM

                    if (tx.Feedbacks["DisplayPortInHdcpCapability"] != null)
                    {
+
                        var intFeedback = tx.Feedbacks["DisplayPortInHdcpCapability"] as IntFeedback;
                        if (intFeedback != null)
+
                            intFeedback.LinkInputSig(trilist.UShortInput[joinMap.Port3HdcpState.JoinNumber]);
-                    }

-                    if (inputPort.ConnectionType == eRoutingPortConnectionType.Hdmi && inputPort.Port != null)
-                    {
-                        var port = inputPort.Port as EndpointDisplayPortInput;
-
-                        SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port3HdcpState.JoinNumber, trilist);
+                        if (inputPort.ConnectionType == eRoutingPortConnectionType.DisplayPort && inputPort.Port != null)
+                        {
+                            var port = inputPort.Port as EndpointDisplayPortInput;
+                            SetHdcpCapabilityAction(port, joinMap.Port3HdcpState.JoinNumber, trilist);
+                        }
                    }
                }

@@ -467,7 +463,7 @@ namespace PepperDash.Essentials.DM
                    });
            }
            else
-            {
+            { 
                trilist.SetUShortSigAction(join,
                        s =>
                        {
@@ -476,17 +472,15 @@ namespace PepperDash.Essentials.DM
            }
        }

-        private void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointDisplayPortInput port, uint join,
+        private void SetHdcpCapabilityAction(EndpointDisplayPortInput port, uint join,
            BasicTriList trilist)
        {
-
-
            trilist.SetUShortSigAction(join,
                s =>
                {
-                    port.HdcpCapability = (eHdcpCapabilityType)s;
+                    Debug.Console(0, this, "Trying to set HDCP to {0} on port {1}", s, port.ToString());
+                    port.HdcpCapability = (eHdcpCapabilityType) s;
                });
-
        }

    }
@@ -495,8 +489,22 @@ namespace PepperDash.Essentials.DM
    {
        public DmTxControllerFactory()
        {
-            TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
+            TypeNames = new List<string>
+            {
+                "dmtx200c",
+                "dmtx201c",
+                "dmtx201s",
+                "dmtx4k100c",
+                "dmtx4k202c",
+                "dmtx4kz202c",
+                "dmtx4k302c",
+                "dmtx4kz302c",
+                "dmtx401c",
+                "dmtx401s",
+                "dmtx4k100c1g",
+                "dmtx4kz100c1g",
+                "hdbasettx"
+            };
        }

        public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -506,8 +514,8 @@ namespace PepperDash.Essentials.DM
            Debug.Console(1, "Factory Attempting to create new DM-TX Device");

            var props = JsonConvert.DeserializeObject
-                <PepperDash.Essentials.DM.Config.DmTxPropertiesConfig>(dc.Properties.ToString());
-            return PepperDash.Essentials.DM.DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
+                <DmTxPropertiesConfig>(dc.Properties.ToString());
+            return DmTxHelper.GetDmTxController(dc.Key, dc.Name, type, props);
        }
    }

--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -16,10 +16,17 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.DM.Config;

 namespace PepperDash.Essentials.DM {
-    public interface IDmSwitch {
+    public interface IDmSwitch
+	{
        Switch Chassis { get; }

        Dictionary<uint, string> TxDictionary { get; }
        Dictionary<uint, string> RxDictionary { get; }
    }
+
+	public interface IDmSwitchWithEndpointOnlineFeedback : IDmSwitch
+	{
+		Dictionary<uint, BoolFeedback> InputEndpointOnlineFeedbacks { get; }
+		Dictionary<uint, BoolFeedback> OutputEndpointOnlineFeedbacks { get; }
+	}
 }
Author	SHA1	Message	Date
Andrew Welker	c047507997	Merge branch 'development' into hotfix/vtc-room-activation-deactivation-changes	2023-07-21 12:22:58 -06:00
Neil Dorin	c46409dc3f	Minor adjustments and added debug messages	2023-07-19 16:55:53 -06:00
Neil Dorin	f73d6994b8	Additional updates to allow occupancy sensor to be cleared when room not active	2023-07-19 16:22:20 -06:00
Neil Dorin	a787be6ccc	Updates Vtc1 room types to allow for deactivation/activation	2023-07-19 15:28:24 -06:00
Neil Dorin	f0ae0094dc	Adds optional enable property to partition sensor config and defaults to enable	2023-07-19 09:50:48 -06:00
Trevor Payne	fcd4b5d772	Merge pull request #1118 from PepperDash/hotfix/AirMediaRegistration Fix Airmedia Registration Issue	2023-07-12 12:52:56 -05:00
Trevor Payne	c3ba6d5c28	fix: fix issue where the customactivate for the base class was beig suppressed in airmedia controllers	2023-07-12 12:27:38 -05:00
Andrew Welker	e1ce35863f	Merge pull request #1109 from PepperDash/release/1.14.0 Release/1.14.0	2023-06-07 10:11:49 -06:00
Andrew Welker	acd3bad1f2	Merge pull request #1108 from PepperDash/release/1.14.0 1.14.0	2023-06-07 09:54:34 -06:00
Andrew Welker	08514915b2	Merge branch 'main' into release/1.14.0	2023-05-09 10:22:08 -06:00
Andrew Welker	ea464038b9	Merge pull request #1106 from PepperDash/hotfix/remove-old-workflow Hotfix/remove old workflow	2023-04-27 13:13:37 -06:00
Andrew Welker	c4c44d02f5	Merge branch 'development' into hotfix/remove-old-workflow	2023-04-27 12:54:18 -06:00
Andrew Welker	3fe5d89904	Merge pull request #1105 from PepperDash/hotfix/remove-old-workflow Delete add-issues-to-project.yml	2023-04-27 12:54:08 -06:00
Jason T Alborough	c0d78e8978	Delete add-issues-to-project.yml	2023-04-27 13:59:36 -04:00
Neil Dorin	3716dd0824	Merge pull request #1104 from PepperDash/hotfix/dm-build-issues Enable DM TX/RX builds for blade chassis DEV	2023-04-27 10:22:15 -06:00
Andrew Welker	ebe8ee5653	Merge branch 'development' into hotfix/dm-build-issues	2023-04-27 09:55:26 -06:00
Andrew Welker	432934ad00	Merge pull request #1103 from PepperDash/hotfix/dm-build-issues Enable DM TX/RX builds for blade chassis	2023-04-27 09:55:08 -06:00
Andrew Welker	372cf86613	Merge pull request #1100 from PepperDash/feature/IHasBatteryStats Add Interfaces for Battery Status Tracking	2023-04-27 09:51:15 -06:00
Andrew Welker	67c99a9ad4	Merge branch 'development' into feature/IHasBatteryStats	2023-04-27 09:26:56 -06:00
Andrew Welker	31085d42a9	Merge pull request #1099 from PepperDash/hotfix/DisplayPortHdcp Resolve Issues with HDCP Displayport	2023-04-27 09:26:41 -06:00
Andrew Welker	0df315426b	fix: use new interface for parentDev The GetDmRmcController & GetDmTxController methods were previously ignoring the `DmBladeChassisController` type. This was causing transmitters connected to a DM blade chassis to not be built,	2023-04-26 13:32:49 -06:00
Andrew Welker	6ddbdd90c7	feat: add new interface and update Chassis controllers	2023-04-26 13:32:18 -06:00
Andrew Welker	39e1e5167b	Merge branch 'development' into hotfix/DisplayPortHdcp	2023-04-20 11:51:21 -06:00
Trevor Payne	7f916d1d2f	refactor: change IHasPowerCycleWithBatteries to IHasPowerCycleWithBattery for clarity	2023-04-20 12:31:50 -05:00
Trevor Payne	7c7f087898	feature: added additional parameters to IHasPowerCycleWithBatteries	2023-04-20 12:29:34 -05:00
Trevor Payne	898dab1d9a	feature: add several interfaces for battery status on devices refactor: mark existing PDU interfaces in PepperDash_Essentials_Core.Devices as obsolete refactor: replicate existing PDU interfaces in PepperDash.Essentials.Core	2023-04-20 12:21:45 -05:00
Andrew Welker	b221d2f0cb	Merge pull request #1098 from PepperDash/hotfix/DisplayPortHdcp Resolve Issues with HDCP Displayport	2023-04-19 08:20:02 -06:00
Trevor Payne	9656269826	fix: resolve issue where displayport hdcp event not registered properly fix: resolve issue where feedback from Displayport HDCP capability was improperly named	2023-04-17 22:27:56 -05:00
Trevor Payne	ba182c1d98	Merge pull request #1094 from PepperDash/hotfix/ConsoleCommandFixes Fix Console Response Line Errors	2023-04-14 14:08:02 -05:00
Andrew Welker	2460290dc1	Merge branch 'main' into hotfix/ConsoleCommandFixes	2023-04-14 12:39:29 -06:00
Andrew Welker	0b01661196	Merge pull request #1093 from PepperDash/hotfix/rmcEnhancements Enhance Endpoint HDCP Functionality	2023-04-14 12:35:27 -06:00
Trevor Payne	dfa55ab9f8	fix: update console responses to properly use explicit NewLine characters fix: Resolve #1084	2023-04-14 12:18:06 -05:00
Andrew Welker	c53cad8119	Merge pull request #1086 from PepperDash/hotfix/pd-core-update-ssh-issues Update PD Core to 1.2.1 DEV	2023-04-07 11:52:23 -06:00
Andrew Welker	82e8b4b203	Merge branch 'development' into hotfix/pd-core-update-ssh-issues	2023-04-07 11:37:31 -06:00
Andrew Welker	8c3b891255	Merge pull request #1082 from PepperDash/feature/vc4-fileio Update VC4 file handling	2023-04-07 11:25:01 -06:00
jtalborough	10fc8ee30b	Merge remote-tracking branch 'origin/feature/vc4-fileio' into development	2023-03-28 16:26:32 -04:00
Andrew Welker	8da8b8c584	Merge pull request #1080 from PepperDash/hotfix/dge-hdcp Add HDCP & Bridging support for DGE Devices DEV	2023-03-27 16:40:39 -06:00
Andrew Welker	c7e0326b8c	Merge branch 'development' into hotfix/dge-hdcp	2023-03-27 16:27:16 -06:00
Neil Dorin	465aa947cf	Merge pull request #1078 from PepperDash/release/1.13.0 1.13.0 DEV	2023-03-24 13:08:18 -06:00
jta	3b2fa8aec5	fix: issue with file path on four sereis refactor: remove redundnet /	2023-01-09 17:16:03 -05:00
jta	ffa864c71b	Merge remote-tracking branch 'origin/development' into feature/vc4-fileio	2023-01-09 15:45:38 -05:00
jta	112a2b7382	feature: fileio now uses Global.FilePathPrefix as its directory All read wirtes now use the current working essentials directory. This resolves issues between 3 series, 4 series, and VC-4	2022-12-20 15:16:18 -05:00