From 6de70a83f1db5d37fe741654aa09da2983b09e8d Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 8 Apr 2020 12:17:10 -0600
Subject: [PATCH] adds IHasCameraControls

---
 .../Cameras/CameraBase.cs                          |  2 +-
 .../Cameras/CameraControl.cs                       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs
index 8e2af6cb..1edd0b11 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs	
@@ -24,7 +24,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         Focus = 8
     }
 
-    public abstract class CameraBase : Device, IRoutingOutputs
+    public abstract class CameraBase : Device, IRoutingOutputs, IHasCameraControls
 	{
         public eCameraControlMode ControlMode { get; protected set; }
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs
index 36142bdd..89b6002a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs	
@@ -72,6 +72,10 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
     }
 
+    public interface IHasCameraControls
+    {
+    }
+
     /// <summary>
     /// Aggregates the pan, tilt and zoom interfaces
     /// </summary>
@@ -86,7 +90,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// <summary>
     /// Interface for camera pan control
     /// </summary>
-    public interface IHasCameraPanControl
+    public interface IHasCameraPanControl : IHasCameraControls
     {
         // void PanLeft(bool pressRelease);
         // void PanRight(bool pressRelease);
@@ -98,7 +102,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// <summary>
     /// Interface for camera tilt control
     /// </summary>
-    public interface IHasCameraTiltControl
+    public interface IHasCameraTiltControl : IHasCameraControls
     {
         // void TiltDown(bool pressRelease);
         // void TildUp(bool pressRelease);
@@ -110,7 +114,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// <summary>
     /// Interface for camera zoom control
     /// </summary>
-    public interface IHasCameraZoomControl
+    public interface IHasCameraZoomControl : IHasCameraControls
     {
         // void ZoomIn(bool pressRelease);
         // void ZoomOut(bool pressRelease);
@@ -122,7 +126,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// <summary>
     /// Interface for camera focus control
     /// </summary>
-    public interface IHasCameraFocusControl
+    public interface IHasCameraFocusControl : IHasCameraControls
     {
         void FocusNear();
         void FocusFar();
@@ -131,7 +135,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         void TriggerAutoFocus();
     }
 
-    public interface IHasCameraAutoMode
+    public interface IHasCameraAutoMode : IHasCameraControls
     {
         void CameraAutoModeOn();
         void CameraAutoModeOff();