Merge branch 'main' into hotfix/unable-to-use-hightest-IR-port-number

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -272,6 +272,20 @@ namespace PepperDash.Essentials
         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/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs

@@ -2,6 +2,7 @@
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.UI;
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
@@ -10,7 +11,7 @@ namespace PepperDash.Essentials
 	/// <summary>
 	/// 
 	/// </summary>
-	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase
+	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase, IHasScreenSaverController
 	{
         CTimer InactivityTimer;
 
@@ -18,7 +19,7 @@ namespace PepperDash.Essentials
 		/// Assign the appropriate A/V driver.
 		/// Want to keep the AvDriver alive, because it may hold states
 		/// </summary>
-		public IAVDriver AvDriver { get; set; }
+		public IAVDriver AvDriver { get; set;}
 
         public EssentialsHeaderDriver HeaderDriver { get; set; }
 
@@ -102,6 +103,7 @@ namespace PepperDash.Essentials
 		{
 			CurrentChildDriver = null;
 			ShowSubDriver(AvDriver as PanelDriverBase);
+
             base.Show();
 		}
 
@@ -129,4 +131,9 @@ namespace PepperDash.Essentials
 				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

@@ -21,6 +21,8 @@ namespace PepperDash.Essentials
         private readonly EssentialsPanelMainInterfaceDriver _parent;
 
 
+        private JoinedSigInterlock PositionInterlock;
+
         CTimer PositionTimer;
 
         uint PositionTimeoutMs;
@@ -38,7 +40,9 @@ namespace PepperDash.Essentials
 
             PositionJoins = new List<uint>() { UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible };
 
-            var cmdName = String.Format("shwscrsvr-{0}", config.IpId);
+            PositionInterlock = new JoinedSigInterlock(parent.TriList);
+
+            var cmdName = String.Format("shwscrsvr-{0}", parent.TriList.ID);
 
             CrestronConsole.AddNewConsoleCommand((o) => Show(), cmdName, "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
 
@@ -47,10 +51,13 @@ namespace PepperDash.Essentials
 
         public override void Show()
         {
-            _parent.AvDriver.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MCScreenSaverVisible);
+            if (_parent.AvDriver != null)
+            {
+                _parent.AvDriver.PopupInterlock.ShowInterlocked(UIBoolJoin.MCScreenSaverVisible);
+            }
 
             CurrentPositionIndex = 0;
-            SetCurrentPosition();
+            ShowCurrentPosition();
             StartPositionTimer();
 
             base.Show();
@@ -58,6 +65,8 @@ namespace PepperDash.Essentials
 
         public override void Hide()
         {
+            Debug.Console(1, "Hiding ScreenSaverController");
+
             if (PositionTimer != null)
             {
                 PositionTimer.Stop();
@@ -67,7 +76,10 @@ namespace PepperDash.Essentials
 
             ClearAllPositions();
 
-            _parent.AvDriver.PopupInterlock.HideAndClear();
+            if (_parent.AvDriver != null)
+            {
+                _parent.AvDriver.PopupInterlock.HideAndClear();
+            }
 
             base.Hide();
         }
@@ -89,7 +101,7 @@ namespace PepperDash.Essentials
         {
             IncrementPositionIndex();
 
-            SetCurrentPosition();
+            ShowCurrentPosition();
 
             StartPositionTimer();
         }
@@ -109,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)
+            Debug.Console(1, "Hiding all screensaver positions");
-            {
+            PositionInterlock.HideAndClear();
-                TriList.SetBool(join, false);
-            }
         }
     }
  

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -398,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;
@@ -413,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)
+                screenSaverParent.ScreenSaverController.Hide(); 
-                {
-                    Parent.PopupInterlock.HideAndClear();
-                }
             }
+            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 =>
@@ -709,17 +717,45 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 uint holdTime = 5000;
                 presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CodecRoomPresetsListHasChanged);
 
-                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset1].SetSigHeldAction(
+                var preset = 1;
-                    holdTime, () => presetsCodec.CodecRoomPresetStore(1, presetsCodec.NearEndPresets[0].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(1));
+                if (presetsCodec.NearEndPresets[preset - 1] != null && presetsCodec.NearEndPresets[preset - 1].Defined)
-                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset2].SetSigHeldAction(
+                {
-                    holdTime, () => presetsCodec.CodecRoomPresetStore(2, presetsCodec.NearEndPresets[1].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(2));
+                    TriList.SetBool(UIBoolJoin.VCCameraPreset1Visible, true);
-                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction(
+                    TriList.BooleanOutput[UIBoolJoin.VCCameraPreset1].SetSigHeldAction(
-                    holdTime, () => presetsCodec.CodecRoomPresetStore(3, presetsCodec.NearEndPresets[2].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(3));
+                        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);
+                }
 
-                TriList.StringInput[UIStringJoin.VCCameraPresetLabel1].StringValue = presetsCodec.NearEndPresets[0].Description;
+                if (presetsCodec.NearEndPresets[1] != null && presetsCodec.NearEndPresets[1].Defined)
-                TriList.StringInput[UIStringJoin.VCCameraPresetLabel2].StringValue = presetsCodec.NearEndPresets[1].Description;
+                {
-                TriList.StringInput[UIStringJoin.VCCameraPresetLabel3].StringValue = presetsCodec.NearEndPresets[2].Description;
+                    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);
+                }
             }
         }