Merge pull request #401 from PepperDash/hotfix/unable-to-use-hightest-IR-port-number

Multiple Fixes for IR

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -424,10 +424,14 @@ namespace PepperDash.Essentials
         {
             if (string.IsNullOrEmpty(sourceListKey))
             {
+                Debug.Console(1, this, "No sourceListKey present.  RunRouteAction assumes default source list.");
                 RunRouteAction(routeKey, new Action(() => { }));
             }
             else
+            {
+                Debug.Console(1, this, "sourceListKey present but not yet implemented");
                 throw new NotImplementedException();
+            }
         }
 
         /// <summary>

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -120,14 +120,22 @@ namespace PepperDash.Essentials
         /// 1206
         /// </summary>
         public const uint VCRecentsVisible = 1206;
-        /// <summary>
-        /// 1207
-        /// </summary>
-        public const uint VCCameraVisible = 1207;
+
 		/// <summary>
 		/// 1208
 		/// </summary>
-		public const uint VCSelfViewLayoutVisible = 1208;
+		public const uint VCCameraAutoVisible = 1208;
+
+        /// <summary>
+        /// 1209
+        /// </summary>
+        public const uint VCCameraManualVisible = 1209;
+
+        /// <summary>
+        /// 1210
+        /// </summary>
+        public const uint VCCameraOffVisible = 1210;
+
         /// <summary>
         /// 1211 - 1215
         /// </summary>
@@ -225,6 +233,59 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public const uint VCMinMaxEnable = 1256;
 
+        /// <summary>
+        /// 1260
+        /// </summary>
+        public const uint VCCameraModeBarVisible = 1260;
+
+        /// <summary>
+        /// 1261
+        /// </summary>
+        public const uint VCCameraSelectBarWithoutModeVisible = 1261;
+
+
+        /// <summary>
+        /// 1271
+        /// </summary>
+        public const uint VCCameraZoomIn = 1271;
+        /// <summary>
+        /// 1272
+        /// </summary>
+        public const uint VCCameraZoomOut = 1272;
+
+
+        /// <summary>
+        /// 1280
+        /// </summary>
+        public const uint VCCameraPresetSavedLabelVisible = 1280;
+        /// <summary>
+        /// 1281
+        /// </summary>
+        public const uint VCCameraPreset1 = 1281;
+        /// <summary>
+        /// 1282
+        /// </summary>
+        public const uint VCCameraPreset2 = 1282;
+        /// <summary>
+        /// 1283
+        /// </summary>
+        public const uint VCCameraPreset3 = 1283;
+
+
+        /// <summary>
+        /// 1291
+        /// </summary>
+        public const uint VCCameraPreset1Visible = 1291;
+        /// <summary>
+        /// 1292
+        /// </summary>
+        public const uint VCCameraPreset2Visible = 1292;
+        /// <summary>
+        /// 1293
+        /// </summary>
+        public const uint VCCameraPreset3Visible = 1293;
+
+
         // Letter joins start at 2921;
 
         //******************************************************

PepperDashEssentials/UI/JoinConstants/UISmartObjectJoin.cs

@@ -33,6 +33,21 @@
 		/// </summary>
 		public const uint VCLayoutsList = 1205;
 
+        /// <summary>
+        /// 1206 VC Camera Mode horizontal list
+        /// </summary>
+        public const uint VCCameraMode = 1206;
+
+        /// <summary>
+        /// 1207 VC Camera Mode Dpad
+        /// </summary>
+        public const uint VCCameraDpad = 1207;
+
+        /// <summary>
+        /// 1208 VC Camera Select
+        /// </summary>
+        public const uint VCCameraSelect = 1208;
+
 
         //******************************************************
         // General

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -41,6 +41,21 @@ namespace PepperDash.Essentials
 		public const uint VCRecentListTimeTextStart = 1231;
         //									RANGE IN USE
         public const uint VCRecentListTimeTextEnd = 1260;
+
+
+        /// <summary>
+        /// 1281
+        /// </summary>
+        public const uint VCCameraPresetLabel1 = 1281;
+        /// <summary>
+        /// 1282
+        /// </summary>
+        public const uint VCCameraPresetLabel2 = 1282;
+        /// <summary>
+        /// 1283
+        /// </summary>
+        public const uint VCCameraPresetLabel3 = 1283;
+
 		/// <summary>
 		/// 1291 - the current layout mode
 		/// </summary>

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -349,7 +349,7 @@ namespace PepperDash.Essentials
             // Check if the popup interlock is shown, and if one of the header popups is current, then show the carets subpage
             if (e.IsShown)
             {
-                if (e.NewJoin == Parent.EnvironmentDriver.BackgroundSubpageJoin)
+                if (Parent.EnvironmentDriver != null && e.NewJoin == Parent.EnvironmentDriver.BackgroundSubpageJoin)
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HeaderActiveCallsListVisible)
                     headerPopupShown = true;

PepperDashEssentials/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs

@@ -1,80 +1,81 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.UI;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase
-	{
-        CTimer InactivityTimer;
-
-		/// <summary>
-		/// Assign the appropriate A/V driver.
-		/// Want to keep the AvDriver alive, because it may hold states
-		/// </summary>
-		public IAVDriver AvDriver { get; set; }
-
-        public EssentialsHeaderDriver HeaderDriver { get; set; }
-
-        public EssentialsEnvironmentDriver EnvironmentDriver { get; set; }
-
-		public PanelDriverBase CurrentChildDriver { get; private set; }
-
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.UI;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.SmartObjects;
+
+namespace PepperDash.Essentials
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase, IHasScreenSaverController
+	{
+        CTimer InactivityTimer;
+
+		/// <summary>
+		/// Assign the appropriate A/V driver.
+		/// Want to keep the AvDriver alive, because it may hold states
+		/// </summary>
+		public IAVDriver AvDriver { get; set;}
+
+        public EssentialsHeaderDriver HeaderDriver { get; set; }
+
+        public EssentialsEnvironmentDriver EnvironmentDriver { get; set; }
+
+		public PanelDriverBase CurrentChildDriver { get; private set; }
+
         public ScreenSaverController ScreenSaverController { get; set; }
 
-	    private readonly long _timeoutMs;
-
-		CrestronTouchpanelPropertiesConfig Config;
-
-        /// <summary>
-        /// The main interlock for popups
-        /// </summary>
-        //public JoinedSigInterlock PopupInterlock { get; private set; }
-
-		public EssentialsPanelMainInterfaceDriver(BasicTriListWithSmartObject trilist,
-			CrestronTouchpanelPropertiesConfig config)
-			: base(trilist)
-		{
-			Config = config;
-
-            _timeoutMs = Config.ScreenSaverTimeoutMin * 60 * 1000;
-
-            var tsx52or60 = trilist as Tswx52ButtonVoiceControl;
-
+	    private readonly long _timeoutMs;
+
+		CrestronTouchpanelPropertiesConfig Config;
+
+        /// <summary>
+        /// The main interlock for popups
+        /// </summary>
+        //public JoinedSigInterlock PopupInterlock { get; private set; }
+
+		public EssentialsPanelMainInterfaceDriver(BasicTriListWithSmartObject trilist,
+			CrestronTouchpanelPropertiesConfig config)
+			: base(trilist)
+		{
+			Config = config;
+
+            _timeoutMs = Config.ScreenSaverTimeoutMin * 60 * 1000;
+
+            var tsx52or60 = trilist as Tswx52ButtonVoiceControl;
+
             if (tsx52or60 != null)
             {
                 tsx52or60.ExtenderTouchDetectionReservedSigs.Use();
                 tsx52or60.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
                 tsx52or60.ExtenderTouchDetectionReservedSigs.Time.UShortValue = 1;
                 ManageInactivityTimer();
-
-            }
-            else
-            {
-                var tswx70 = trilist as TswX70Base;
-                if (tswx70 != null)
+
+            }
+            else
+            {
+                var tswx70 = trilist as TswX70Base;
+                if (tswx70 != null)
                 {
                     tswx70.ExtenderTouchDetectionReservedSigs.Use();
                     tswx70.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
                     tswx70.ExtenderTouchDetectionReservedSigs.Time.UShortValue = 1;
-                    ManageInactivityTimer();
-                }
-            }
-		}
-
-        void ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange(Crestron.SimplSharpPro.DeviceExtender currentDeviceExtender, Crestron.SimplSharpPro.SigEventArgs args)
-        {
-
+                    ManageInactivityTimer();
+                }
+            }
+		}
+
+        void ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange(Crestron.SimplSharpPro.DeviceExtender currentDeviceExtender, Crestron.SimplSharpPro.SigEventArgs args)
+        {
+
             if (args.Sig.BoolValue)
             {
                 ManageInactivityTimer();
-            }
+            }
         }
 
 	    private void ManageInactivityTimer()
@@ -87,46 +88,52 @@ namespace PepperDash.Essentials
             {
                 InactivityTimer = new CTimer((o) => InactivityTimerExpired(), _timeoutMs);
             }
-	    }
-
-        void InactivityTimerExpired()
-        {
-            InactivityTimer.Stop();
-            InactivityTimer.Dispose();
-            InactivityTimer = null;
-
-            ScreenSaverController.Show();
-        }
-
-		public override void Show()
-		{
-			CurrentChildDriver = null;
-			ShowSubDriver(AvDriver as PanelDriverBase);
-            base.Show();
-		}
-
-		public override void Hide()
-		{
-			TriList.BooleanInput[AvDriver.StartPageVisibleJoin].BoolValue = false;
-			base.Hide();
-		}
-
-		void ShowSubDriver(PanelDriverBase driver)
-		{
-			CurrentChildDriver = driver;
-			if (driver == null)
-				return;
-			this.Hide();
-			driver.Show();
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		public override void BackButtonPressed()
-		{
-			if(CurrentChildDriver != null)
-				CurrentChildDriver.BackButtonPressed();
-		}
-	}
+	    }
+
+        void InactivityTimerExpired()
+        {
+            InactivityTimer.Stop();
+            InactivityTimer.Dispose();
+            InactivityTimer = null;
+
+            ScreenSaverController.Show();
+        }
+
+		public override void Show()
+		{
+			CurrentChildDriver = null;
+			ShowSubDriver(AvDriver as PanelDriverBase);
+
+            base.Show();
+		}
+
+		public override void Hide()
+		{
+			TriList.BooleanInput[AvDriver.StartPageVisibleJoin].BoolValue = false;
+			base.Hide();
+		}
+
+		void ShowSubDriver(PanelDriverBase driver)
+		{
+			CurrentChildDriver = driver;
+			if (driver == null)
+				return;
+			this.Hide();
+			driver.Show();
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		public override void BackButtonPressed()
+		{
+			if(CurrentChildDriver != null)
+				CurrentChildDriver.BackButtonPressed();
+		}
+	}
+
+    public interface IHasScreenSaverController
+    {
+        ScreenSaverController ScreenSaverController { get; }
+    }
 }

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -114,7 +114,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// The parent driver for this
         /// </summary>
-        PanelDriverBase Parent;
+        public PanelDriverBase Parent { get; private set; }
 
         /// <summary>
         /// All children attached to this driver.  For hiding and showing as a group.

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -72,7 +72,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// The parent driver for this
         /// </summary>
-        PanelDriverBase Parent;
+        public PanelDriverBase Parent { get; private set; }
 
         /// <summary>
         /// All children attached to this driver.  For hiding and showing as a group.
@@ -1430,6 +1430,7 @@ namespace PepperDash.Essentials
     /// </summary>
     public interface IAVDriver
     {
+        PanelDriverBase Parent { get; }
         JoinedSigInterlock PopupInterlock { get; }
         void ShowNotificationRibbon(string message, int timeout);
         void HideNotificationRibbon();

PepperDashEssentials/UIDrivers/ScreenSaverController.cs

@@ -18,9 +18,11 @@ namespace PepperDash.Essentials
         /// <summary>
         /// The parent driver for this
         /// </summary>
-        EssentialsPanelMainInterfaceDriver Parent;
+        private readonly EssentialsPanelMainInterfaceDriver _parent;
 
 
+        private JoinedSigInterlock PositionInterlock;
+
         CTimer PositionTimer;
 
         uint PositionTimeoutMs;
@@ -32,34 +34,56 @@ namespace PepperDash.Essentials
         public ScreenSaverController(EssentialsPanelMainInterfaceDriver parent, CrestronTouchpanelPropertiesConfig config)
             : base(parent.TriList)
         {
-            Parent = parent;
+            _parent = parent;
 
             PositionTimeoutMs = config.ScreenSaverMovePositionIntervalMs;
 
-            TriList.SetSigFalseAction(UIBoolJoin.MCScreenSaverClosePress, () => this.Hide());
+            PositionJoins = new List<uint>() { UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible };
 
+            PositionInterlock = new JoinedSigInterlock(parent.TriList);
+
+            var cmdName = String.Format("shwscrsvr-{0}", parent.TriList.ID);
+
+            CrestronConsole.AddNewConsoleCommand((o) => Show(), cmdName, "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
+
+            TriList.SetSigFalseAction(UIBoolJoin.MCScreenSaverClosePress, Hide);
         }
 
         public override void Show()
         {
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, true);
-            Parent.AvDriver.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MCScreenSaverVisible);
-            //TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, true);
+            if (_parent.AvDriver != null)
+            {
+                _parent.AvDriver.PopupInterlock.ShowInterlocked(UIBoolJoin.MCScreenSaverVisible);
+            }
 
             CurrentPositionIndex = 0;
-            SetCurrentPosition();
+            ShowCurrentPosition();
+            StartPositionTimer();
+
+            base.Show();
+        }
+
+        public override void Hide()
+        {
+            Debug.Console(1, "Hiding ScreenSaverController");
+
+            if (PositionTimer != null)
+            {
+                PositionTimer.Stop();
+                PositionTimer.Dispose();
+                PositionTimer = null;
+            }
 
             ClearAllPositions();
 
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, false);
-            Parent.AvDriver.PopupInterlock.HideAndClear();
-            //TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, false);
+            if (_parent.AvDriver != null)
+            {
+                _parent.AvDriver.PopupInterlock.HideAndClear();
+            }
 
             base.Hide();
         }
 
-
-
         void StartPositionTimer()
         {
             if (PositionTimer == null)
@@ -77,7 +101,7 @@ namespace PepperDash.Essentials
         {
             IncrementPositionIndex();
 
-            SetCurrentPosition();
+            ShowCurrentPosition();
 
             StartPositionTimer();
         }
@@ -97,20 +121,16 @@ namespace PepperDash.Essentials
         }
 
         //
-        void SetCurrentPosition()
+        void ShowCurrentPosition()
         {
-            ClearAllPositions();
-
             // Set based on current index
-            TriList.SetBool(PositionJoins[CurrentPositionIndex], true);
+            PositionInterlock.ShowInterlocked(PositionJoins[CurrentPositionIndex]);
         }
 
         void ClearAllPositions()
         {
-            foreach (var join in PositionJoins)
-            {
-                TriList.SetBool(join, false);
-            }
+            Debug.Console(1, "Hiding all screensaver positions");
+            PositionInterlock.HideAndClear();
         }
     }
  

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
@@ -13,6 +14,7 @@ using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.UIDrivers.VC
 {
@@ -41,6 +43,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         JoinedSigInterlock VCControlsInterlock;
 
+        /// <summary>
+        /// For the camera control mode (auto/manual/off)
+        /// </summary>
+        JoinedSigInterlock VCCameraControlModeInterlock;
+
         /// <summary>
         /// For the different staging bars: Active, inactive
         /// </summary>
@@ -58,6 +65,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
         SmartObjectDynamicList RecentCallsList;
 
 		SmartObjectDynamicList DirectoryList;
+
+        SmartObjectDPad CameraPtzPad;
+
+        SmartObjectDynamicList CameraModeList;
+
+        SmartObjectDynamicList CameraSelectList;
         
         BoolFeedback DirectoryBackButtonVisibleFeedback;
 
@@ -76,6 +89,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
 		bool CodecHasFavorites;
 
+        bool ShowCameraModeControls;
+
 		CTimer BackspaceTimer;
 
 
@@ -118,6 +133,9 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
                 VCControlsInterlock = new JoinedSigInterlock(triList);
+                VCCameraControlModeInterlock = new JoinedSigInterlock(triList);
+
+
                 if (CodecHasFavorites)
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadWithFavoritesVisible);
                 else
@@ -161,6 +179,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 SetupDirectoryList();
 
+
                 SearchStringBackspaceVisibleFeedback = new BoolFeedback(() => SearchStringBuilder.Length > 0);
                 SearchStringBackspaceVisibleFeedback.LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackspaceVisible]);
 
@@ -196,6 +215,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if(HeaderDriver.HeaderButtonsAreSetUp)
                 HeaderDriver.ComputeHeaderCallStatus(Codec);
+
+            SetupCameraControls();
         }
 
         void SetupAddresses()
@@ -377,6 +398,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void ShowIncomingModal(CodecActiveCallItem call)
         {
+            Debug.Console(1, "Showing Incoming Call Modal");
+
 			(Parent as IAVWithVCDriver).PrepareForCodecIncomingCall();
             IncomingCallModal = new ModalDialog(TriList);
             string msg;
@@ -392,13 +415,19 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 msg = string.Format("Incoming video call from: {0}", call.Name);
             }
 
-            if (Parent.PopupInterlock.IsShown)
+
+            // Hide screensaver
+            var screenSaverParent = Parent.Parent as IHasScreenSaverController;
+
+            if (screenSaverParent != null)
             {
-                if (Parent.PopupInterlock.CurrentJoin == UIBoolJoin.MCScreenSaverVisible)
-                {
-                    Parent.PopupInterlock.HideAndClear();
-                }
+                screenSaverParent.ScreenSaverController.Hide(); 
             }
+            else
+            {
+                Debug.Console(1, "Parent.Parent is null or does not implement IHasScreenSaverController");
+            }
+
 
             IncomingCallModal.PresentModalDialog(2, "Incoming Call", icon, msg,
                 "Ignore", "Accept", false, false, b =>
@@ -450,6 +479,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingDirectoryPress, ShowDirectory);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingKeypadPress, ShowKeypad);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingRecentsPress, ShowRecents);
+            TriList.SetSigFalseAction(UIBoolJoin.VCStagingCameraPress, ShowCameraControls);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingConnectPress, ConnectPress);
             TriList.SetSigFalseAction(UIBoolJoin.CallEndPress, () =>
                 {
@@ -467,6 +497,393 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				});
         }
 
+        void SetupCameraControls()
+        {
+            CameraPtzPad = new SmartObjectDPad(TriList.SmartObjects[UISmartObjectJoin.VCCameraDpad], true);
+
+            // If the codec supports camera auto or off, we need to show the mode selector subpage
+            ShowCameraModeControls = Codec is IHasCameraAutoMode || Codec is IHasCameraOff;
+
+            if (ShowCameraModeControls)
+            {
+                CameraModeList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCCameraMode], true, 0);
+
+                VCControlsInterlock.StatusChanged += new EventHandler<StatusChangedEventArgs>(VCControlsInterlock_StatusChanged);
+
+
+                var codecOffCameras = Codec as IHasCameraOff;
+
+                var codecAutoCameras = Codec as IHasCameraAutoMode;
+
+                if (codecAutoCameras != null)
+                {
+                    CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
+                    TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
+                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
+                    //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
+                    //() => codecAutoCameras.CameraAutoModeOn());
+
+
+                    codecAutoCameras.CameraAutoModeIsOnFeedback.OutputChange += (o, a) =>
+                        {
+                            if (a.BoolValue)
+                            {
+                                SetCameraManualModeButtonFeedback(false);
+
+                                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                                {
+                                    VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraAutoVisible);
+                                }
+                                else
+                                {
+                                    VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
+                                }
+                            }
+                            else
+                            {
+                                ShowCameraManualMode();
+                            }
+
+                        };
+                }
+
+                // Manual button always visible
+                CameraModeList.SetItemButtonAction(2, (b) => ShowCameraManualMode());
+
+                TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 2 Visible"].BoolValue = true;
+                //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
+                //    () => ShowCameraManualMode());
+
+                if (codecOffCameras != null)
+                {
+                    TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
+                    codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
+                    CameraModeList.SetItemButtonAction(3, (b) => codecOffCameras.CameraOff());
+                    //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 3 Pressed"].SetSigFalseAction(
+                    //    () => codecOffCameras.CameraOff());
+
+                    codecOffCameras.CameraIsOffFeedback.OutputChange += (o, a) =>
+                        {
+                            if (a.BoolValue)
+                            {
+                                SetCameraManualModeButtonFeedback(false);
+
+                                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                                {
+                                    VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraOffVisible);
+                                }
+                                else
+                                {
+                                    VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraOffVisible);
+                                }
+                            }
+                            else
+                            {
+                                ShowCameraManualMode();
+                            }
+
+                        };
+                }
+            }
+
+            var camerasCodec = Codec as IHasCameras;
+
+            if(camerasCodec != null)
+            {
+                //CameraSelectList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect], true, 0);
+
+                var so = TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect];
+
+                so.SigChange += SmartObject_SigChange;
+
+                for (uint i = 1; i <= camerasCodec.Cameras.Count; i++)
+                {
+                    var cameraKey = camerasCodec.Cameras[(int)i - 1].Key;
+                    Debug.Console(1, "Setting up action for Camera {0} with Key: {1} for button Item {0} Pressed", i, cameraKey);
+
+                    //TODO: Fix camera selection action.  For some reson this action doesn't execute when the buttons are pressed
+
+                    var sig = so.BooleanOutput[String.Format("Item {0} Pressed", i)];
+
+                    so.BooleanOutput[string.Format("Item {0} Pressed", i)].SetSigFalseAction(
+                        () => camerasCodec.SelectCamera(cameraKey));
+                }
+
+                so.UShortInput["Set Number of Items"].UShortValue = (ushort)camerasCodec.Cameras.Count;
+                //TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].UShortOutput["Item Clicked"].SetUShortSigAction(
+                //    (u) =>
+                //    {
+                //        var cameraKey = camerasCodec.Cameras[u - 1].Key;
+                //        Debug.Console(1, "Selecting Camera {0} with Key: {1}", u, cameraKey);
+                //        camerasCodec.SelectCamera(cameraKey);
+                //    });
+
+
+                // Set the names for the cameras
+                for (int i = 1; i <= camerasCodec.Cameras.Count; i++)
+                {
+                    so.StringInput[string.Format("Set Item {0} Text", i)].StringValue = camerasCodec.Cameras[i - 1].Name;
+                }
+
+                SetCameraSelectedFeedback();
+                camerasCodec.CameraSelected += camerasCodec_CameraSelected;
+                MapCameraActions();
+            }
+
+            SetupPresets();
+ 
+        }
+
+        void SmartObject_SigChange(GenericBase currentDevice, SmartObjectEventArgs args)
+        {
+            var uo = args.Sig.UserObject;
+            if (uo is Action<bool>)
+                (uo as Action<bool>)(args.Sig.BoolValue);
+            else if (uo is Action<ushort>)
+                (uo as Action<ushort>)(args.Sig.UShortValue);
+            else if (uo is Action<string>)
+                (uo as Action<string>)(args.Sig.StringValue);
+        }
+
+        void VCControlsInterlock_StatusChanged(object sender, StatusChangedEventArgs e)
+        {
+            // Need to hide the camera mode interlock if the mode bar gets hidden
+            if (e.PreviousJoin == UIBoolJoin.VCCameraModeBarVisible)
+                VCCameraControlModeInterlock.Hide();
+
+            // These deal with hiding/showing the camera select bar if no mode controls are visible (tied to manual controls being visible)
+            if(!ShowCameraModeControls)
+            {
+                if(e.PreviousJoin == UIBoolJoin.VCCameraManualVisible)
+                    TriList.SetBool(UIBoolJoin.VCCameraSelectBarWithoutModeVisible, false);
+
+                if (e.NewJoin == UIBoolJoin.VCCameraManualVisible)
+                    TriList.SetBool(UIBoolJoin.VCCameraSelectBarWithoutModeVisible, true);
+            }
+
+
+        }
+
+
+        /// <summary>
+        /// Shows the preset saved label for 2 seconds
+        /// </summary>
+        void ShowPresetStoreFeedback()
+        {
+            TriList.BooleanInput[UIBoolJoin.VCCameraPresetSavedLabelVisible].BoolValue = true;
+
+            var timer = new CTimer((o) => TriList.BooleanInput[UIBoolJoin.VCCameraPresetSavedLabelVisible].BoolValue = false, 2000);
+        }
+
+        void presetsCodec_CodecRoomPresetsListHasChanged(object sender, EventArgs e)
+        {
+            SetupPresets();
+        }
+
+
+        void camerasCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
+        {
+            MapCameraActions();
+
+            SetCameraSelectedFeedback();
+        }
+
+        /// <summary>
+        /// Set the feedback for the button of the selected camera
+        /// </summary>
+        void SetCameraSelectedFeedback()
+        {
+            var camerasCodec = Codec as IHasCameras;
+
+            for (int i = 1; i <= camerasCodec.Cameras.Count; i++)
+            {
+                var cameraSelected = camerasCodec.SelectedCameraFeedback.StringValue;
+                var state = false;
+                if (cameraSelected == camerasCodec.Cameras[i - 1].Key)
+                {
+                    state = true;
+                }
+
+                TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].BooleanInput[string.Format("Item {0} Selected", i)].BoolValue = state;
+            }
+  
+        }
+
+        void SetupPresets()
+        {
+            var presetsCodec = Codec as IHasCodecRoomPresets;
+            if (presetsCodec != null)
+            {
+                uint holdTime = 5000;
+                presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CodecRoomPresetsListHasChanged);
+
+                var preset = 1;
+                if (presetsCodec.NearEndPresets[preset - 1] != null && presetsCodec.NearEndPresets[preset - 1].Defined)
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset1Visible, true);
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset1].SetSigHeldAction(
+                        holdTime, ShowPresetStoreFeedback,() => presetsCodec.CodecRoomPresetStore(preset, presetsCodec.NearEndPresets[preset - 1].Description), 
+                        () => presetsCodec.CodecRoomPresetSelect(preset));
+                    TriList.StringInput[UIStringJoin.VCCameraPresetLabel1].StringValue = presetsCodec.NearEndPresets[preset - 1].Description;
+                }
+                else
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset1Visible, false);
+                }
+
+                if (presetsCodec.NearEndPresets[1] != null && presetsCodec.NearEndPresets[1].Defined)
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset2Visible, true);
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset2].SetSigHeldAction(
+                        holdTime, ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetStore(preset, presetsCodec.NearEndPresets[preset - 1].Description),
+                        () => presetsCodec.CodecRoomPresetSelect(preset));
+                    TriList.StringInput[UIStringJoin.VCCameraPresetLabel2].StringValue = presetsCodec.NearEndPresets[1].Description;
+                }
+                else
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset2Visible, false);
+                }
+
+                if (presetsCodec.NearEndPresets[2] != null && presetsCodec.NearEndPresets[2].Defined)
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset3Visible, true);
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction(
+                        holdTime, ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetStore(preset, presetsCodec.NearEndPresets[preset - 1].Description),
+                        () => presetsCodec.CodecRoomPresetSelect(preset));
+                    TriList.StringInput[UIStringJoin.VCCameraPresetLabel3].StringValue = presetsCodec.NearEndPresets[2].Description;
+                }
+                else
+                {
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset3Visible, false);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Maps button actions to the selected camera
+        /// </summary>
+        void MapCameraActions()
+        {
+            // Now we setup the button actions for the manual controls
+            var camerasCodec = Codec as IHasCameras;
+
+            if (camerasCodec != null && camerasCodec.SelectedCamera != null)
+            {
+
+                var dpad = CameraPtzPad;
+
+                var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
+                if (camera != null)
+                {
+                    if (camerasCodec.SelectedCamera.CanTilt)
+                    {
+                        dpad.SigUp.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.TiltUp();
+                                else
+                                    camera.TiltStop();
+                            });
+                        dpad.SigDown.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.TiltDown();
+                                else
+                                    camera.TiltStop();
+                            });
+                    }
+
+                    if (camerasCodec.SelectedCamera.CanPan)
+                    {
+                        dpad.SigLeft.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.PanLeft();
+                                else
+                                    camera.PanStop();
+                            });
+                        dpad.SigRight.SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.PanRight();
+                                else
+                                    camera.PanStop();
+                            });
+                    }
+
+
+                    //dpad.SigCenter.SetSigFalseAction(() => camera.PositionHome());
+
+                    //var homeButton = dpad.BooleanOutput["Home"];
+                    //if (homeButton != null)
+                    //{
+                    //    homeButton.SetSigFalseAction(() => camera.PositionHome());
+                    //}
+
+                    if (camerasCodec.SelectedCamera.CanZoom)
+                    {
+                        TriList.BooleanOutput[UIBoolJoin.VCCameraZoomIn].SetBoolSigAction((b) =>
+                            {
+                                if (b)
+                                    camera.ZoomIn();
+                                else
+                                    camera.ZoomStop();
+                            });
+                        TriList.BooleanOutput[UIBoolJoin.VCCameraZoomOut].SetBoolSigAction((b) =>
+                           {
+                               if (b)
+                                   camera.ZoomOut();
+                               else
+                                   camera.ZoomStop();
+                           });
+                    }
+
+                }
+            }
+        }
+
+        // Determines if codec is in manual camera control mode and shows feedback
+        void ShowCameraManualMode()
+        {
+            var inManualMode = true;
+
+            var codecOffCameras = Codec as IHasCameraOff;
+
+            var codecAutoCameras = Codec as IHasCameraAutoMode;
+
+            if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
+            {
+                inManualMode = false;
+            }
+
+            // Clear auto mode
+            if (codecAutoCameras != null )
+            {
+                if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
+                {
+                    codecAutoCameras.CameraAutoModeOff();
+                    inManualMode = true;
+                }
+            }
+
+            if (inManualMode)
+            {
+                VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraManualVisible);
+
+                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                    VCCameraControlModeInterlock.Show();
+            }
+
+            SetCameraManualModeButtonFeedback(inManualMode);
+
+        }
+
+        void SetCameraManualModeButtonFeedback(bool state)
+        {
+            // Set button feedback for manual mode
+            TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 2 Selected"].BoolValue = state;
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -927,7 +1344,32 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void ShowCameraControls()
         {
-            VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraVisible);
+            if (ShowCameraModeControls)
+            {
+                VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraModeBarVisible);
+
+                if (VCCameraControlModeInterlock.CurrentJoin != 0)
+                {
+                    VCCameraControlModeInterlock.Show();
+                }
+                else
+                {
+                    var codecAutoCamera = Codec as IHasCameraAutoMode;
+                    if (codecAutoCamera != null)
+                    {
+                        ShowCameraManualMode();
+                        VCCameraControlModeInterlock.Show();
+                    }
+                }
+            }
+            else
+            {
+                // Just show the manual camera control page
+                VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraManualVisible);
+            }
+
+
+
             StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingCameraPress);
         }
 
@@ -960,7 +1402,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// </summary>
 		void ShowSelfViewLayout()
 		{
-			VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCSelfViewLayoutVisible);
+			VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCCameraAutoVisible);
 			StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingSelfViewLayoutPress);
 		}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/IRPortHelper.cs

@@ -1,83 +1,83 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IRPortHelper
-	{
-		public static string IrDriverPathPrefix
-		{
-			get
-			{
-				return Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
-			}
-		}
-
-		/// <summary>
-		/// Finds either the ControlSystem or a device controller that contains IR ports and
-		/// returns a port from the hardware device
-		/// </summary>
-		/// <param name="propsToken"></param>
-		/// <returns>IrPortConfig object.  The port and or filename will be empty/null 
-		/// if valid values don't exist on config</returns>
-		public static IrOutPortConfig GetIrPort(JToken propsToken)
-		{
-			var control = propsToken["control"];
-			if (control == null)
-				return null;
-			if (control["method"].Value<string>() != "ir")
-			{
-				Debug.Console(0, "IRPortHelper called with non-IR properties");
-				return null;
-			}
-
-			var port = new IrOutPortConfig();
-
-			var portDevKey = control.Value<string>("controlPortDevKey");
-			var portNum = control.Value<uint>("controlPortNumber");
-			if (portDevKey == null || portNum == 0)
-			{
-				Debug.Console(1, "WARNING: Properties is missing port device or port number");
-				return port;
-			}
-
-			IIROutputPorts irDev = null;
-			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-				|| portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
-				irDev = Global.ControlSystem;
-			else
-				irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
-
-			if (irDev == null)
-			{
-				Debug.Console(1, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
-				return port;
-			}
-
-			if (portNum <= irDev.NumberOfIROutputPorts) // success!
-			{
-				var file = IrDriverPathPrefix + control["irFile"].Value<string>();
-				port.Port = irDev.IROutputPorts[portNum];
-				port.FileName = file;
-				return port; // new IrOutPortConfig { Port = irDev.IROutputPorts[portNum], FileName = file };
-			}
-			else
-			{
-				Debug.Console(1, "[Config] Error, device '{0}' IR port {1} out of range",
-					portDevKey, portNum);
-				return port;
-			}
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public static class IRPortHelper
+	{
+		public static string IrDriverPathPrefix
+		{
+			get
+			{
+				return Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
+			}
+		}
+
+		/// <summary>
+		/// Finds either the ControlSystem or a device controller that contains IR ports and
+		/// returns a port from the hardware device
+		/// </summary>
+		/// <param name="propsToken"></param>
+		/// <returns>IrPortConfig object.  The port and or filename will be empty/null 
+		/// if valid values don't exist on config</returns>
+		public static IrOutPortConfig GetIrPort(JToken propsToken)
+		{
+			var control = propsToken["control"];
+			if (control == null)
+				return null;
+			if (control["method"].Value<string>() != "ir")
+			{
+				Debug.Console(0, "IRPortHelper called with non-IR properties");
+				return null;
+			}
+
+			var port = new IrOutPortConfig();
+
+			var portDevKey = control.Value<string>("controlPortDevKey");
+			var portNum = control.Value<uint>("controlPortNumber");
+			if (portDevKey == null || portNum == 0)
+			{
+				Debug.Console(1, "WARNING: Properties is missing port device or port number");
+				return port;
+			}
+
+			IIROutputPorts irDev = null;
+			if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
+				|| portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
+				irDev = Global.ControlSystem;
+			else
+				irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
+
+			if (irDev == null)
+			{
+				Debug.Console(1, "[Config] Error, device with IR ports '{0}' not found", portDevKey);
+				return port;
+			}
+
+			if (portNum <= irDev.NumberOfIROutputPorts) // success!
+			{
+				var file = IrDriverPathPrefix + control["irFile"].Value<string>();
+				port.Port = irDev.IROutputPorts[portNum];
+				port.FileName = file;
+				return port; // new IrOutPortConfig { Port = irDev.IROutputPorts[portNum], FileName = file };
+			}
+			else
+			{
+				Debug.Console(1, "[Config] Error, device '{0}' IR port {1} out of range",
+					portDevKey, portNum);
+				return port;
+			}
 		}
 
 	    public static IROutputPort GetIrOutputPort(DeviceConfig dc)
@@ -124,7 +124,7 @@ namespace PepperDash.Essentials.Core
 	            Debug.Console(0, "WARNING: device with IR ports '{0}' not found", portDevKey);
 	            return null;
 	        }
-	        if (portNum >= irDev.NumberOfIROutputPorts)
+	        if (portNum > irDev.NumberOfIROutputPorts)
 	        {
 	            Debug.Console(0, "WARNING: device '{0}' IR port {1} out of range",
 	                portDevKey, portNum);
@@ -134,10 +134,9 @@ namespace PepperDash.Essentials.Core
 
 	        var port = irDev.IROutputPorts[portNum];
 
-	        port.LoadIRDriver(Global.FilePathPrefix + "IR" + Global.DirectorySeparator + control["irFile"].Value<string>());
+            
 
 	        return port;
-
 	    }
 
 	    public static IrOutputPortController GetIrOutputPortController(DeviceConfig config)
@@ -149,87 +148,88 @@ namespace PepperDash.Essentials.Core
 	            return null;
 	        }
 
-	        var irDevice = new IrOutputPortController(config.Key, GetIrOutputPort, config);
+            var postActivationFunc = new Func<DeviceConfig,IROutputPort> (GetIrOutputPort);
+	        var irDevice = new IrOutputPortController(config.Key + "-ir", postActivationFunc, config);
 
 	        return irDevice;
 	    }
 
-	    /*
-        /// <summary>
-        /// Returns a ready-to-go IrOutputPortController from a DeviceConfig object.
-        /// </summary>	
-        public static IrOutputPortController GetIrOutputPortController(DeviceConfig devConf)
-        {
-            var irControllerKey = devConf.Key + "-ir";
-            if (devConf.Properties == null)
-            {
-                Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
-                return new IrOutputPortController(irControllerKey, null, "");
-            }
-
-            var control = devConf.Properties["control"];
-            if (control == null)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: Device config does not include control properties.  IR will not function");
-                return c;
-            }
-
-            var portDevKey = control.Value<string>("controlPortDevKey");
-            var portNum = control.Value<uint>("controlPortNumber");
-            IIROutputPorts irDev = null;
-
-            if (portDevKey == null)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: control properties is missing ir device");
-                return c;
-            }
-
-            if (portNum == 0)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: control properties is missing ir port number");
-                return c;
-            } 
-
-            if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
-                || portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
-                irDev = Global.ControlSystem;
-            else
-                irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
-
-            if (irDev == null)
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
-                return c;
-            }
-
-            if (portNum <= irDev.NumberOfIROutputPorts) // success!
-                return new IrOutputPortController(irControllerKey, irDev.IROutputPorts[portNum],
-                    IrDriverPathPrefix + control["irFile"].Value<string>());
-            else
-            {
-                var c = new IrOutputPortController(irControllerKey, null, "");
-                Debug.Console(0, c, "WARNING: device '{0}' IR port {1} out of range",
-                    portDevKey, portNum);
-                return c;
-            }
+	    /*
+        /// <summary>
+        /// Returns a ready-to-go IrOutputPortController from a DeviceConfig object.
+        /// </summary>	
+        public static IrOutputPortController GetIrOutputPortController(DeviceConfig devConf)
+        {
+            var irControllerKey = devConf.Key + "-ir";
+            if (devConf.Properties == null)
+            {
+                Debug.Console(0, "[{0}] WARNING: Device config does not include properties.  IR will not function.", devConf.Key);
+                return new IrOutputPortController(irControllerKey, null, "");
+            }
+
+            var control = devConf.Properties["control"];
+            if (control == null)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: Device config does not include control properties.  IR will not function");
+                return c;
+            }
+
+            var portDevKey = control.Value<string>("controlPortDevKey");
+            var portNum = control.Value<uint>("controlPortNumber");
+            IIROutputPorts irDev = null;
+
+            if (portDevKey == null)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: control properties is missing ir device");
+                return c;
+            }
+
+            if (portNum == 0)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: control properties is missing ir port number");
+                return c;
+            } 
+
+            if (portDevKey.Equals("controlSystem", StringComparison.OrdinalIgnoreCase)
+                || portDevKey.Equals("processor", StringComparison.OrdinalIgnoreCase))
+                irDev = Global.ControlSystem;
+            else
+                irDev = DeviceManager.GetDeviceForKey(portDevKey) as IIROutputPorts;
+
+            if (irDev == null)
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: device with IR ports '{0}' not found", portDevKey);
+                return c;
+            }
+
+            if (portNum <= irDev.NumberOfIROutputPorts) // success!
+                return new IrOutputPortController(irControllerKey, irDev.IROutputPorts[portNum],
+                    IrDriverPathPrefix + control["irFile"].Value<string>());
+            else
+            {
+                var c = new IrOutputPortController(irControllerKey, null, "");
+                Debug.Console(0, c, "WARNING: device '{0}' IR port {1} out of range",
+                    portDevKey, portNum);
+                return c;
+            }
         }*/
-	}
-
-	/// <summary>
-	/// Wrapper to help in IR port creation
-	/// </summary>
-	public class IrOutPortConfig
-	{
-		public IROutputPort Port { get; set; }
-		public string FileName { get; set; }
-
-		public IrOutPortConfig()
-		{
-			FileName = "";
-		}
-	}
+	}
+
+	/// <summary>
+	/// Wrapper to help in IR port creation
+	/// </summary>
+	public class IrOutPortConfig
+	{
+		public IROutputPort Port { get; set; }
+		public string FileName { get; set; }
+
+		public IrOutPortConfig()
+		{
+			FileName = "";
+		}
+	}
 }

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

@@ -25,6 +25,8 @@ namespace PepperDash.Essentials.Core
 		public string DriverFilepath { get; private set; }
 		public bool DriverIsLoaded { get; private set; }
 
+        public string[] IrFileCommands { get { return IrPort.AvailableStandardIRCmds(IrPortUid); } }
+
 		/// <summary>
 		/// Constructor for IrDevice base class.  If a null port is provided, this class will 
 		/// still function without trying to talk to a port.
@@ -49,9 +51,30 @@ namespace PepperDash.Essentials.Core
             AddPostActivationAction(() =>
             {
                 IrPort = postActivationFunc(config);
+
+                if (IrPort == null)
+                {
+                    Debug.Console(0, this, "WARNING No valid IR Port assigned to controller. IR will not function");
+                    return;
+                }
+                
+                var filePath = Global.FilePathPrefix + "ir" + Global.DirectorySeparator + config.Properties["control"]["irFile"].Value<string>();
+                Debug.Console(1, "*************Attemting to load IR file: {0}***************", filePath);
+
+                LoadDriver(filePath);
+                    
+                PrintAvailableCommands();
             });
 	    }
 
+	    public void PrintAvailableCommands()
+	    {
+            Debug.Console(2, this, "Available IR Commands in IR File {0}", IrPortUid);
+            foreach (var cmd in IrPort.AvailableIRCmds())
+            {
+                Debug.Console(2, this, "{0}", cmd);
+            }
+	    }
 	    
 
 	    /// <summary>
@@ -60,14 +83,15 @@ namespace PepperDash.Essentials.Core
 		/// <param name="path"></param>
 		public void LoadDriver(string path)
 		{
+            Debug.Console(2, this, "***Loading IR File***");
 			if (string.IsNullOrEmpty(path)) path = DriverFilepath;
-			try
-			{
-				IrPortUid = IrPort.LoadIRDriver(path);
-				DriverFilepath = path;
-				StandardIrPulseTime = 200;
-				DriverIsLoaded = true;
-			}
+	        try
+	        {
+	            IrPortUid = IrPort.LoadIRDriver(path);
+	            DriverFilepath = path;
+	            StandardIrPulseTime = 200;
+	            DriverIsLoaded = true;
+	        }
 			catch
 			{
 				DriverIsLoaded = false;

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

@@ -198,6 +198,7 @@ namespace PepperDash.Essentials.DM
             Chassis.DMInputChange += new DMInputEventHandler(Chassis_DMInputChange);
             Chassis.DMSystemChange += new DMSystemEventHandler(Chassis_DMSystemChange);
             Chassis.DMOutputChange += new DMOutputEventHandler(Chassis_DMOutputChange);
+            Chassis.BaseEvent += ChassisOnBaseEvent;
             VideoOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             AudioOutputFeedbacks = new Dictionary<uint, IntFeedback>();
             UsbOutputRoutedToFeebacks = new Dictionary<uint, IntFeedback>();
@@ -355,6 +356,20 @@ namespace PepperDash.Essentials.DM
                                 InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
                                 return (int)(inputCard.Card as Dmc4kHdBase).HdmiInput.HdcpReceiveCapability;
                             }
+                            if (inputCard.Card is Dmc4kHdDspBase)
+                            {
+                                if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
+                                {
+                                    InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
+                                    return (int)(inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpReceiveCapability;
+                                }
+
+                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+                                if ((inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                                    return 1;
+                                return 0;
+                            }
+
                             if (inputCard.Card is Dmc4kCBase)
                             {
                                 if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
@@ -861,6 +876,24 @@ namespace PepperDash.Essentials.DM
                                 Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
                             break;
                         }
+                    case DMInputEventIds.HdcpSupportOffEventId:
+                        {
+                            Debug.Console(2, this, "DM Input {0} HdcpSupportOffEventId", args.Number);
+                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                            else
+                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
+                            break;
+                        }
+                    case DMInputEventIds.HdcpSupportOnEventId:
+                        {
+                            Debug.Console(2, this, "DM Input {0} HdcpSupportOnEventId", args.Number);
+                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                            else
+                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
+                            break;
+                        }
                     default:
                         {
                             Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
@@ -1184,8 +1217,8 @@ namespace PepperDash.Essentials.DM
 
             var hdmiInPortWCec = port as HdmiInputWithCEC;
             
- 
-            SetHdcpStateAction(true, hdmiInPortWCec, joinMap.HdcpSupportState.JoinNumber + ioSlotJoin, trilist);
+            
+            SetHdcpStateAction(PropertiesConfig.InputSlotSupportsHdcp2[ioSlot], hdmiInPortWCec, joinMap.HdcpSupportState.JoinNumber + ioSlotJoin, trilist);
             
 
             InputCardHdcpStateFeedbacks[ioSlot].LinkInputSig(
@@ -1474,10 +1507,12 @@ namespace PepperDash.Essentials.DM
                     {
                         if (s == 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to off", join, s); 
                             port.HdcpSupportOff();
                         }
                         else if (s > 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to on", join, s); 
                             port.HdcpSupportOn();
                         }
                     });
@@ -1487,6 +1522,7 @@ namespace PepperDash.Essentials.DM
                 trilist.SetUShortSigAction(join,
                         u =>
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpReceiveCapability to: {2}", join, u, (eHdcpCapabilityType)u); 
                             port.HdcpReceiveCapability = (eHdcpCapabilityType)u;
                         });
             }
@@ -1501,10 +1537,12 @@ namespace PepperDash.Essentials.DM
                     {
                         if (s == 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to off", join, s);
                             port.HdcpSupportOff();
                         }
                         else if (s > 0)
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpSupport to on", join, s);
                             port.HdcpSupportOn();
                         }
                     });
@@ -1514,6 +1552,7 @@ namespace PepperDash.Essentials.DM
                 trilist.SetUShortSigAction(join,
                         u =>
                         {
+                            Debug.Console(2, this, "Join {0} value {1} Setting HdcpReceiveCapability to: {2}", join, u, (eHdcpCapabilityType)u);
                             port.HdcpCapability = (eHdcpCapabilityType)u;
                         });
             }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Streaming/AppleTV.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
@@ -32,39 +33,50 @@ namespace PepperDash.Essentials.Devices.Common
 			AnyAudioOut = new RoutingOutputPort(RoutingPortNames.AnyAudioOut, eRoutingSignalType.Audio, 
 				eRoutingPortConnectionType.DigitalAudio, null, this);
 			OutputPorts = new RoutingPortCollection<RoutingOutputPort> { HdmiOut, AnyAudioOut };
+
+            PrintExpectedIrCommands();
 		}
 
+        public void PrintExpectedIrCommands()
+        {
+            var cmds = typeof (AppleTvIrCommands).GetCType().GetFields(BindingFlags.Public | BindingFlags.Static);
 
-		#region IDPad Members
+            foreach (var value in cmds.Select(cmd => cmd.GetValue(null)).OfType<string>())
+            {
+                Debug.Console(2, this, "Expected IR Function Name: {0}", value);
+            }
+        }
+
+        #region IDPad Members
 
 		public void Up(bool pressRelease)
 		{
-			IrPort.PressRelease("+", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Up, pressRelease);
 		}
 
 		public void Down(bool pressRelease)
 		{
-			IrPort.PressRelease("-", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Down, pressRelease);
 		}
 
 		public void Left(bool pressRelease)
 		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_TRACK_MINUS, pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Left, pressRelease);
 		}
 
 		public void Right(bool pressRelease)
 		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_TRACK_PLUS, pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Right, pressRelease);
 		}
 
 		public void Select(bool pressRelease)
 		{
-			IrPort.PressRelease(IROutputStandardCommands.IROut_ENTER, pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Enter, pressRelease);
 		}
 
 		public void Menu(bool pressRelease)
 		{
-			IrPort.PressRelease("Menu", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.Menu, pressRelease);
 		}
 
 		public void Exit(bool pressRelease)
@@ -78,12 +90,12 @@ namespace PepperDash.Essentials.Devices.Common
 
 		public void Play(bool pressRelease)
 		{
-			IrPort.PressRelease("PLAY/PAUSE", pressRelease);
+			IrPort.PressRelease(AppleTvIrCommands.PlayPause, pressRelease);
 		}
 
 		public void Pause(bool pressRelease)
 		{
-			IrPort.PressRelease("PLAY/PAUSE", pressRelease);
+            IrPort.PressRelease(AppleTvIrCommands.PlayPause, pressRelease);
 		}
 
 		/// <summary>
@@ -190,4 +202,17 @@ namespace PepperDash.Essentials.Devices.Common
         }
     }
 
+    public static class AppleTvIrCommands
+    {
+        
+        public static string Up = "+";
+        public static string Down = "-";
+        public static string Left = IROutputStandardCommands.IROut_TRACK_MINUS;
+        public static string Right = IROutputStandardCommands.IROut_TRACK_PLUS;
+        public static string Enter = IROutputStandardCommands.IROut_ENTER;
+        public static string PlayPause = "PLAY/PAUSE";
+        public static string Rewind = "REWIND";
+        public static string Menu = "Menu";
+        public static string FastForward = "FASTFORWARD";
+    }
 }