More testing. Only remaining issue is camera selection

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -131,6 +131,11 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCCameraManualVisible = 1209;
 
+        /// <summary>
+        /// 1210
+        /// </summary>
+        public const uint VCCameraOffVisible = 1210;
+
         /// <summary>
         /// 1211 - 1215
         /// </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/ScreenSaverController.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// The parent driver for this
         /// </summary>
-        EssentialsPanelMainInterfaceDriver Parent;
+        private readonly EssentialsPanelMainInterfaceDriver _parent;
 
 
         CTimer PositionTimer;
@@ -32,34 +32,46 @@ 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 };
 
+            var cmdName = String.Format("shwscrsvr-{0}", config.IpId);
+
+            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);
+            _parent.AvDriver.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MCScreenSaverVisible);
 
             CurrentPositionIndex = 0;
             SetCurrentPosition();
+            StartPositionTimer();
+
+            base.Show();
+        }
+
+        public override void Hide()
+        {
+            if (PositionTimer != null)
+            {
+                PositionTimer.Stop();
+                PositionTimer.Dispose();
+                PositionTimer = null;
+            }
 
             ClearAllPositions();
 
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, false);
-            Parent.AvDriver.PopupInterlock.HideAndClear();
-            //TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, false);
+            _parent.AvDriver.PopupInterlock.HideAndClear();
 
             base.Hide();
         }
 
-
-
         void StartPositionTimer()
         {
             if (PositionTimer == null)

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -64,6 +64,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
         SmartObjectDynamicList RecentCallsList;
 
 		SmartObjectDynamicList DirectoryList;
+
+        SmartObjectDPad CameraPtzPad;
+
+        SmartObjectDynamicList CameraModeList;
+
+        SmartObjectDynamicList CameraSelectList;
         
         BoolFeedback DirectoryBackButtonVisibleFeedback;
 
@@ -483,11 +489,15 @@ 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);
 
 
@@ -497,38 +507,65 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 if (codecAutoCameras != null)
                 {
+                    CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
-                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Selected"]);
-                    TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 3 Pressed"].SetSigFalseAction(
-                    () => codecAutoCameras.CameraAutoModeOn());
+                    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)
                             {
-                                VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
+                                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(TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Selected"]);
-                    TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 3 Pressed"].SetSigFalseAction(
-                        () => codecOffCameras.CameraOff());
-
+                    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)
                             {
-                                VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraAutoVisible);
+                                SetCameraManualModeButtonFeedback(false);
+
+                                if (VCControlsInterlock.CurrentJoin == UIBoolJoin.VCCameraModeBarVisible)
+                                {
+                                    VCCameraControlModeInterlock.ShowInterlocked(UIBoolJoin.VCCameraOffVisible);
+                                }
+                                else
+                                {
+                                    VCCameraControlModeInterlock.SetButDontShow(UIBoolJoin.VCCameraOffVisible);
+                                }
                             }
                             else
                             {
@@ -537,12 +574,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                         };
                 }
-
-
-                // Manual button always visible
-                TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 2 Visible"].BoolValue = true;
-                TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
-                    () => ShowCameraManualMode());
             }
 
             var camerasCodec = Codec as IHasCameras;
@@ -553,6 +584,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 TriList.SmartObjects[UISmartObjectJoin.VCCameraSelect].UShortOutput["Item Clicked"].SetUShortSigAction(
                     (u) => camerasCodec.SelectCamera(camerasCodec.Cameras[u - 1].Key));
 
+                //TODO: Fix camera selection and labels
+
                 // Set the names for the cameras
                 for (int i = 1; i <= camerasCodec.Cameras.Count; i++)
                 {
@@ -564,20 +597,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 MapCameraActions();
             }
 
-            var presetsCodec = Codec as IHasCodecRoomPresets;
-            if (presetsCodec != null)
-            {
-                uint holdTime = 5000;
-                presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CodecRoomPresetsListHasChanged);
-
-                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset1].SetSigHeldAction(
-                    holdTime, () => presetsCodec.CodecRoomPresetStore(1, presetsCodec.NearEndPresets[0].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(1));
-                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset2].SetSigHeldAction(
-                    holdTime, () => presetsCodec.CodecRoomPresetStore(2, presetsCodec.NearEndPresets[1].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(2));
-                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction(
-                    holdTime, () => presetsCodec.CodecRoomPresetStore(3, presetsCodec.NearEndPresets[2].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(3));
-
-            }
+            SetupPresets();
  
         }
 
@@ -613,13 +633,37 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
         void presetsCodec_CodecRoomPresetsListHasChanged(object sender, EventArgs e)
         {
-            throw new NotImplementedException();
+            SetupPresets();
         }
+
+
         void  camerasCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
         {
             MapCameraActions();
         }
 
+        void SetupPresets()
+        {
+            var presetsCodec = Codec as IHasCodecRoomPresets;
+            if (presetsCodec != null)
+            {
+                uint holdTime = 5000;
+                presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CodecRoomPresetsListHasChanged);
+
+                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset1].SetSigHeldAction(
+                    holdTime, () => presetsCodec.CodecRoomPresetStore(1, presetsCodec.NearEndPresets[0].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(1));
+                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset2].SetSigHeldAction(
+                    holdTime, () => presetsCodec.CodecRoomPresetStore(2, presetsCodec.NearEndPresets[1].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(2));
+                TriList.BooleanOutput[UIBoolJoin.VCCameraPreset3].SetSigHeldAction(
+                    holdTime, () => presetsCodec.CodecRoomPresetStore(3, presetsCodec.NearEndPresets[2].Description), ShowPresetStoreFeedback, () => presetsCodec.CodecRoomPresetSelect(3));
+
+                TriList.StringInput[UIStringJoin.VCCameraPresetLabel1].StringValue = presetsCodec.NearEndPresets[0].Description;
+                TriList.StringInput[UIStringJoin.VCCameraPresetLabel2].StringValue = presetsCodec.NearEndPresets[1].Description;
+                TriList.StringInput[UIStringJoin.VCCameraPresetLabel3].StringValue = presetsCodec.NearEndPresets[2].Description;
+
+            }
+        }
+
         /// <summary>
         /// Maps button actions to the selected camera
         /// </summary>
@@ -631,21 +675,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
             if (camerasCodec != null && camerasCodec.SelectedCamera != null)
             {
 
-                var dpad = TriList.SmartObjects[UISmartObjectJoin.VCCameraDpad];
+                var dpad = CameraPtzPad;
 
                 var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
                 if (camera != null)
                 {
                     if (camerasCodec.SelectedCamera.CanTilt)
                     {
-                        dpad.BooleanOutput["Up"].SetBoolSigAction((b) =>
+                        dpad.SigUp.SetBoolSigAction((b) =>
                             {
                                 if (b)
                                     camera.TiltUp();
                                 else
                                     camera.TiltStop();
                             });
-                        dpad.BooleanOutput["Down"].SetBoolSigAction((b) =>
+                        dpad.SigDown.SetBoolSigAction((b) =>
                             {
                                 if (b)
                                     camera.TiltDown();
@@ -656,14 +700,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                     if (camerasCodec.SelectedCamera.CanPan)
                     {
-                        dpad.BooleanOutput["Left"].SetBoolSigAction((b) =>
+                        dpad.SigLeft.SetBoolSigAction((b) =>
                             {
                                 if (b)
                                     camera.PanLeft();
                                 else
                                     camera.PanStop();
                             });
-                        dpad.BooleanOutput["Right"].SetBoolSigAction((b) =>
+                        dpad.SigRight.SetBoolSigAction((b) =>
                             {
                                 if (b)
                                     camera.PanRight();
@@ -672,11 +716,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             });
                     }
 
-                    var homeButton = dpad.BooleanOutput["Home"];
-                    if (homeButton != null)
-                    {
-                        homeButton.SetSigFalseAction(() => camera.PositionHome());
-                    }
+
+                    //dpad.SigCenter.SetSigFalseAction(() => camera.PositionHome());
+
+                    //var homeButton = dpad.BooleanOutput["Home"];
+                    //if (homeButton != null)
+                    //{
+                    //    homeButton.SetSigFalseAction(() => camera.PositionHome());
+                    //}
 
                     if (camerasCodec.SelectedCamera.CanZoom)
                     {
@@ -714,18 +761,32 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 inManualMode = false;
             }
 
-            if (codecAutoCameras != null && codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
+            // Clear auto mode
+            if (codecAutoCameras != null )
             {
-                inManualMode = false;
+                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 = inManualMode;
+            TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 2 Selected"].BoolValue = state;
         }
 
         /// <summary>
@@ -1196,6 +1257,15 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 {
                     VCCameraControlModeInterlock.Show();
                 }
+                else
+                {
+                    var codecAutoCamera = Codec as IHasCameraAutoMode;
+                    if (codecAutoCamera != null)
+                    {
+                        ShowCameraManualMode();
+                        VCCameraControlModeInterlock.Show();
+                    }
+                }
             }
             else
             {