feat (essentials): wip to move interfaces to their own folder/namespace

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -12,6 +12,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core.Bridges
 {

src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs

@@ -100,6 +100,7 @@ namespace PepperDash.Essentials.Core
 
 		#endregion
 	}
+
 	public class GenericHttpClientEventArgs : EventArgs
 	{
 		public string ResponseText { get; private set; }

src/PepperDash.Essentials.Core/Crestron IO/Relay/GenericRelayDevice.cs

@@ -9,6 +9,7 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core.CrestronIO
 {

src/PepperDash.Essentials.Core/Crestron IO/Relay/ISwitchedOutput.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    /// <summary>
-    /// Describes an output capable of switching on and off
-    /// </summary>
-    public interface ISwitchedOutput
-    {
-        BoolFeedback OutputIsOnFeedback {get;}
-
-        void On();
-        void Off();
-    }
-
-    public interface ISwitchedOutputCollection
-    {
-        Dictionary<uint, ISwitchedOutput> SwitchedOutputs { get; }
-    }
-}

src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs

@@ -5,6 +5,8 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Core.JsonStandardObjects;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs

@@ -1,16 +0,0 @@
-using System;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.DeviceInfo
-{
-    public interface IDeviceInfoProvider:IKeyed
-    {
-        DeviceInfo DeviceInfo { get; }
-
-        event DeviceInfoChangeHandler DeviceInfoChanged;
-
-        void UpdateDeviceInfo();
-    }
-
-    public delegate void DeviceInfoChangeHandler(IKeyed device, DeviceInfoEventArgs args);
-}

src/PepperDash.Essentials.Core/DeviceControlsParentInterfaces/IPresentationSource.cs

@@ -1,19 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using Crestron.SimplSharpPro;
-//using Crestron.SimplSharpPro.DeviceSupport;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public interface IPresentationSource : IKeyed
-//    {
-//        string Name { get; }
-//        PresentationSourceType Type { get; }
-//        string IconName { get; set; }
-//        BoolFeedback HasPowerOnFeedback { get; }
-		
-//    }
-//}

src/PepperDash.Essentials.Core/DeviceInfo/DeviceInfoChangeHandler.cs

@@ -0,0 +1,7 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.DeviceInfo
+{
+    // TODO: Change to event args... no reason for extraneous delegate
+    public delegate void DeviceInfoChangeHandler(IKeyed device, DeviceInfoEventArgs args);
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs

@@ -1,6 +1,4 @@
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
@@ -18,30 +16,4 @@ namespace PepperDash.Essentials.Core
 		void Info(bool pressRelease);
 		void Exit(bool pressRelease);
 	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IChannelExtensions
-	{
-		public static void LinkButtons(this IChannel dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(123, dev.ChannelUp);
-			triList.SetBoolSigAction(124, dev.ChannelDown);
-			triList.SetBoolSigAction(125, dev.LastChannel);
-			triList.SetBoolSigAction(137, dev.Guide);
-			triList.SetBoolSigAction(129, dev.Info);
-			triList.SetBoolSigAction(134, dev.Exit);
-		}
-
-		public static void UnlinkButtons(this IChannel dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(123);
-			triList.ClearBoolSigAction(124);
-			triList.ClearBoolSigAction(125);
-			triList.ClearBoolSigAction(137);
-			triList.ClearBoolSigAction(129);
-			triList.ClearBoolSigAction(134);
-		}
-	}
 }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannelExtensions.cs

@@ -0,0 +1,30 @@
+using Crestron.SimplSharpPro.DeviceSupport;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static class IChannelExtensions
+    {
+        public static void LinkButtons(this IChannel dev, BasicTriList triList)
+        {
+            triList.SetBoolSigAction(123, dev.ChannelUp);
+            triList.SetBoolSigAction(124, dev.ChannelDown);
+            triList.SetBoolSigAction(125, dev.LastChannel);
+            triList.SetBoolSigAction(137, dev.Guide);
+            triList.SetBoolSigAction(129, dev.Info);
+            triList.SetBoolSigAction(134, dev.Exit);
+        }
+
+        public static void UnlinkButtons(this IChannel dev, BasicTriList triList)
+        {
+            triList.ClearBoolSigAction(123);
+            triList.ClearBoolSigAction(124);
+            triList.ClearBoolSigAction(125);
+            triList.ClearBoolSigAction(137);
+            triList.ClearBoolSigAction(129);
+            triList.ClearBoolSigAction(134);
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasBranding.cs

@@ -1,20 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
-{
-    public interface IHasBranding
-    {
-        bool BrandingEnabled { get; }
-        void InitializeBranding(string roomKey);
-    }
-}
-
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
-{
-    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
-    public interface IHasBranding
-    {
-        bool BrandingEnabled { get; }
-        void InitializeBranding(string roomKey);
-    }
-}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumeric.cs

@@ -33,13 +33,7 @@ namespace PepperDash.Essentials.Core
 		void KeypadAccessoryButton2(bool pressRelease);
 	}
 
-	public interface ISetTopBoxNumericKeypad : INumericKeypad
-	{
-		void Dash(bool pressRelease);
-		void KeypadEnter(bool pressRelease);
-	}
-
-	/// <summary>
+    /// <summary>
 	/// 
 	/// </summary>
 	public static class INumericExtensions

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs

@@ -1,6 +1,7 @@
 using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.SmartObjects;
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/Template.cs

@@ -1,9 +0,0 @@
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials.Core
-{
-	
-}

src/PepperDash.Essentials.Core/Devices/AudioChangeEventArgs.cs

@@ -5,16 +5,11 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {
-
-	public enum AudioChangeType
-	{
-		Mute, Volume
-	}
-
-	public class AudioChangeEventArgs
+    public class AudioChangeEventArgs
 	{
 		public AudioChangeType ChangeType { get; private set; }
 		public IBasicVolumeControls AudioDevice { get; private set; }

src/PepperDash.Essentials.Core/Devices/AudioChangeType.cs

@@ -0,0 +1,7 @@
+namespace PepperDash.Essentials.Core
+{
+    public enum AudioChangeType
+    {
+        Mute, Volume
+    }
+}

src/PepperDash.Essentials.Core/Devices/CodecInterfaces.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Adds control of codec receive volume
-    /// </summary>
-    public interface IReceiveVolume
-    {
-        // Break this out into 3 interfaces
-        void SetReceiveVolume(ushort level);
-        void ReceiveMuteOn();
-        void ReceiveMuteOff();
-        void ReceiveMuteToggle();
-        IntFeedback ReceiveLevelFeedback { get; }
-        BoolFeedback ReceiveMuteIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Adds control of codec transmit volume
-    /// </summary>
-    public interface ITransmitVolume
-    {
-        void SetTransmitVolume(ushort level);
-        void TransmitMuteOn();
-        void TransmitMuteOff();
-        void TransmitMuteToggle();
-        IntFeedback TransmitLevelFeedback { get; }
-        BoolFeedback TransmitMuteIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Adds control of codec privacy function (microphone mute)
-    /// </summary>
-    public interface IPrivacy
-    {
-        void PrivacyModeOn();
-        void PrivacyModeOff();
-        void PrivacyModeToggle();
-        BoolFeedback PrivacyModeIsOnFeedback { get; }
-    }
-}

src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs

@@ -6,13 +6,14 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core.Devices
 {
     /// <summary>
     /// This wrapper class is meant to allow interfaces to be applied to any Crestron processor
     /// </summary>
-    public class CrestronProcessor : Device, ISwitchedOutputCollection
+    public class CrestronProcessor : Device, IHasSwitchedOutputs
     {
         public Dictionary<uint, ISwitchedOutput> SwitchedOutputs { get; private set; }
 

src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs

@@ -1,5 +1,6 @@
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public interface IOnline
-	{
-		BoolFeedback IsOnline { get; }
-	}
-
-	///// <summary>
-	///// ** WANT THIS AND ALL ITS FRIENDS TO GO AWAY **
-	///// Defines a class that has a list of CueAction objects, typically
-	///// for linking functions to user interfaces or API calls
-	///// </summary>
-	//public interface IHasCueActionList
-	//{
-	//    List<CueActionPair> CueActionList { get; }
-	//}
-
-
-	//public interface IHasComPortsHardware
-	//{
-	//    IComPorts ComPortsDevice { get; }
-	//}
-
-	/// <summary>
-	/// Describes a device that can have a video sync providing device attached to it
-	/// </summary>
-	public interface IAttachVideoStatus : IKeyed
-	{
-		// Extension methods will depend on this
-	}
-
-	/// <summary>
-	/// For display classes that can provide usage data
-	/// </summary>
-	public interface IDisplayUsage
-	{
-		IntFeedback LampHours { get; }
-	}
-
-	public interface IMakeModel : IKeyed
-	{
-		string DeviceMake { get; }
-		string DeviceModel { get; }
-	}
-}

src/PepperDash.Essentials.Core/Devices/IAttachVideoStatusExtensions.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Devices/IProjectorInterfaces.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IBasicVideoMute
-    {
-        void VideoMuteToggle();
-    }
-
-    public interface IBasicVideoMuteWithFeedback : IBasicVideoMute
-    {
-        BoolFeedback VideoMuteIsOn { get; }
-
-        void VideoMuteOn();
-        void VideoMuteOff();
- 
-    }
-}

src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs

@@ -3,59 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {
-	/// <summary>
-	/// Defines minimal volume and mute control methods
-	/// </summary>
-    public interface IBasicVolumeControls : IHasVolumeControl, IHasMuteControl
-	{
-	}
-
-    /// <summary>
-    /// Defines basic volume control methods
-    /// </summary>
-    public interface IHasVolumeControl
-    {
-        void VolumeUp(bool pressRelease);
-        void VolumeDown(bool pressRelease);
-    }
-
-    /// <summary>
-    /// Defines volume control methods and properties with feedback
-    /// </summary>
-    public interface IHasVolumeControlWithFeedback : IHasVolumeControl
-    {
-        void SetVolume(ushort level);
-        IntFeedback VolumeLevelFeedback { get; }
-    }
-
-    /// <summary>
-    /// Defines basic mute control methods
-    /// </summary>
-    public interface IHasMuteControl
-    {
-        void MuteToggle();
-    }
-
-    /// <summary>
-    /// Defines mute control methods and properties with feedback
-    /// </summary>
-    public interface IHasMuteControlWithFeedback : IHasMuteControl
-    {
-        BoolFeedback MuteFeedback { get; }
-        void MuteOn();
-        void MuteOff();
-    }
-
-	/// <summary>
-	/// Adds feedback and direct volume level set to IBasicVolumeControls
-	/// </summary>
-    public interface IBasicVolumeWithFeedback : IBasicVolumeControls, IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
-	{
-	}
-
     /// <summary>
     /// A class that implements this contains a reference to a current IBasicVolumeControls device.
     /// The class may have multiple IBasicVolumeControls.

src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs

@@ -5,6 +5,7 @@ using Crestron.SimplSharpPro;
 
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
 

src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs

@@ -5,6 +5,7 @@ using Crestron.SimplSharpPro;
 
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
 

src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs

@@ -9,6 +9,7 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core.Devices
 {

src/PepperDash.Essentials.Core/Devices/UsageTracking.cs

@@ -1,25 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Devices
 {
-    public interface IUsageTracking
-    {
-        UsageTracking UsageTracker { get; set; }
-    }
-
-    //public static class IUsageTrackingExtensions
-    //{
-    //    public static void EnableUsageTracker(this IUsageTracking device)
-    //    {
-    //        device.UsageTracker = new UsageTracking();
-    //    }
-    //}
-
     public class UsageTracking
     {
         public event EventHandler<DeviceUsageEventArgs> DeviceUsageEnded;
@@ -45,7 +28,7 @@ namespace PepperDash.Essentials.Core
 
         void  InUseFeedback_OutputChange(object sender, EventArgs e)
         {
- 	        if(InUseTracker.InUseFeedback.BoolValue)
+            if(InUseTracker.InUseFeedback.BoolValue)
             {
                 StartDeviceUsage();
             }
@@ -95,10 +78,4 @@ namespace PepperDash.Essentials.Core
             }
         }
     }
-
-    public class DeviceUsageEventArgs : EventArgs
-    {
-        public DateTime UsageEndTime { get; set; }
-        public int MinutesUsed { get; set; }
-    }
 }

src/PepperDash.Essentials.Core/Devices/VolumeDeviceChangeEventArgs.cs

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Display/BasicIrDisplay.cs

@@ -10,6 +10,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/Display/DisplayBase.cs

@@ -11,6 +11,8 @@ using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 
 
 namespace PepperDash.Essentials.Core

src/PepperDash.Essentials.Core/Display/MockDisplay.cs

@@ -11,6 +11,7 @@ using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Config;
 

src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -11,6 +11,8 @@ using Crestron.SimplSharpPro.Fusion;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core.Fusion
 {

src/PepperDash.Essentials.Core/InUseTracking/DeviceUsageEventArgs.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DeviceUsageEventArgs : EventArgs
+    {
+        public DateTime UsageEndTime { get; set; }
+        public int MinutesUsed { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IAttachVideoStatus.cs

@@ -0,0 +1,12 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Describes a device that can have a video sync providing device attached to it
+    /// </summary>
+    public interface IAttachVideoStatus : IKeyed
+    {
+        // Extension methods will depend on this
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IBasicVideoMute.cs

@@ -0,0 +1,7 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IBasicVideoMute
+    {
+        void VideoMuteToggle();
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IBasicVideoMuteWithFeedback.cs

@@ -0,0 +1,11 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IBasicVideoMuteWithFeedback : IBasicVideoMute
+    {
+        BoolFeedback VideoMuteIsOn { get; }
+
+        void VideoMuteOn();
+        void VideoMuteOff();
+ 
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IBasicVolumeControls.cs

@@ -0,0 +1,9 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Defines minimal volume and mute control methods
+    /// </summary>
+    public interface IBasicVolumeControls : IHasVolumeControl, IHasMuteControl
+    {
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IBasicVolumeWithFeedback.cs

@@ -0,0 +1,9 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Adds feedback and direct volume level set to IBasicVolumeControls
+    /// </summary>
+    public interface IBasicVolumeWithFeedback : IBasicVolumeControls, IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
+    {
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IBridgeAdvanced.cs

@@ -1,6 +1,7 @@
 using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Essentials.Core.Bridges;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Interfaces
 {
     /// <summary>
     /// Defines a device that uses JoinMapBaseAdvanced for its join map

src/PepperDash.Essentials.Core/Interfaces/IDeviceInfoProvider.cs

@@ -0,0 +1,14 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceInfo;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IDeviceInfoProvider:IKeyed
+    {
+        DeviceInfo.DeviceInfo DeviceInfo { get; }
+
+        event DeviceInfoChangeHandler DeviceInfoChanged;
+
+        void UpdateDeviceInfo();
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IDisplayUsage.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// For display classes that can provide usage data
+    /// </summary>
+    public interface IDisplayUsage
+    {
+        IntFeedback LampHours { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IDspPreset.cs

@@ -0,0 +1,8 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    // TODO: Is this a base class?
+    public interface IDspPreset
+    {
+        string Name { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IHasBranding.cs

@@ -0,0 +1,8 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IHasBranding
+    {
+        bool BrandingEnabled { get; }
+        void InitializeBranding(string roomKey);
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IHasDspPresets.cs

@@ -1,17 +1,10 @@
 using System.Collections.Generic;
 
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Interfaces
 {
     public interface IHasDspPresets
     {
         List<IDspPreset> Presets { get; }
-
         void RecallPreset(IDspPreset preset);
-
-    }
-
-    public interface IDspPreset
-    {
-        string Name { get; }
     }
 }

src/PepperDash.Essentials.Core/Interfaces/IHasMuteControl.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Defines basic mute control methods
+    /// </summary>
+    public interface IHasMuteControl
+    {
+        void MuteToggle();
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IHasMuteControlWithFeedback.cs

@@ -0,0 +1,12 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Defines mute control methods and properties with feedback
+    /// </summary>
+    public interface IHasMuteControlWithFeedback : IHasMuteControl
+    {
+        BoolFeedback MuteFeedback { get; }
+        void MuteOn();
+        void MuteOff();
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IHasSwitchedOutputs.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IHasSwitchedOutputs
+    {
+        Dictionary<uint, ISwitchedOutput> SwitchedOutputs { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IHasVolumeControl.cs

@@ -0,0 +1,11 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Defines basic volume control methods
+    /// </summary>
+    public interface IHasVolumeControl
+    {
+        void VolumeUp(bool pressRelease);
+        void VolumeDown(bool pressRelease);
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IHasVolumeControlWithFeedback.cs

@@ -0,0 +1,11 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Defines volume control methods and properties with feedback
+    /// </summary>
+    public interface IHasVolumeControlWithFeedback : IHasVolumeControl
+    {
+        void SetVolume(ushort level);
+        IntFeedback VolumeLevelFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IInUseTracking.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
+namespace PepperDash.Essentials.Core.Interfaces
 {
+    // TODO: potentially anemic model here
 	/// <summary>
 	/// Defines a class that uses an InUseTracker
 	/// </summary>

src/PepperDash.Essentials.Core/Interfaces/IMakeModel.cs

@@ -0,0 +1,10 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IMakeModel : IKeyed
+	{
+		string DeviceMake { get; }
+		string DeviceModel { get; }
+	}
+}

src/PepperDash.Essentials.Core/Interfaces/IOnline.cs

@@ -0,0 +1,7 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IOnline
+    {
+        BoolFeedback IsOnline { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IPrivacy.cs

@@ -0,0 +1,13 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Adds control of codec privacy function (microphone mute)
+    /// </summary>
+    public interface IPrivacy
+    {
+        void PrivacyModeOn();
+        void PrivacyModeOff();
+        void PrivacyModeToggle();
+        BoolFeedback PrivacyModeIsOnFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IReceiveVolume.cs

@@ -0,0 +1,16 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Adds control of codec receive volume
+    /// </summary>
+    public interface IReceiveVolume
+    {
+        // Break this out into 3 interfaces
+        void SetReceiveVolume(ushort level);
+        void ReceiveMuteOn();
+        void ReceiveMuteOff();
+        void ReceiveMuteToggle();
+        IntFeedback ReceiveLevelFeedback { get; }
+        BoolFeedback ReceiveMuteIsOnFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IReconfigurableDevice.cs

@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using PepperDash.Essentials.Core.Config;
 
-
-namespace PepperDash.Essentials.Core.Devices
+namespace PepperDash.Essentials.Core.Interfaces
 {
     public interface IReconfigurableDevice
     {

src/PepperDash.Essentials.Core/Interfaces/ISetTopBoxNumericKeypad.cs

@@ -0,0 +1,8 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface ISetTopBoxNumericKeypad : INumericKeypad
+    {
+        void Dash(bool pressRelease);
+        void KeypadEnter(bool pressRelease);
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/ISwitchedOutput.cs

@@ -0,0 +1,14 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    // TODO: Is-A relationship; consider refactoring
+    /// <summary>
+    /// Describes an output capable of switching on and off
+    /// </summary>
+    public interface ISwitchedOutput
+    {
+        BoolFeedback OutputIsOnFeedback {get;}
+
+        void On();
+        void Off();
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/ITransmitVolume.cs

@@ -0,0 +1,15 @@
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    /// <summary>
+    /// Adds control of codec transmit volume
+    /// </summary>
+    public interface ITransmitVolume
+    {
+        void SetTransmitVolume(ushort level);
+        void TransmitMuteOn();
+        void TransmitMuteOff();
+        void TransmitMuteToggle();
+        IntFeedback TransmitLevelFeedback { get; }
+        BoolFeedback TransmitMuteIsOnFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Core/Interfaces/IUsageTracking.cs

@@ -0,0 +1,17 @@
+using PepperDash.Essentials.Core.Devices;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+    public interface IUsageTracking
+    {
+        UsageTracking UsageTracker { get; set; }
+    }
+
+    //public static class IUsageTrackingExtensions
+    //{
+    //    public static void EnableUsageTracker(this IUsageTracking device)
+    //    {
+    //        device.UsageTracker = new UsageTracking();
+    //    }
+    //}
+}

src/PepperDash.Essentials.Core/Lighting/ILightingLoad.cs

@@ -0,0 +1,15 @@
+namespace PepperDash.Essentials.Core.Lighting
+{
+    /// <summary>
+    /// Requiremnts for controlling a lighting load
+    /// </summary>
+    public interface ILightingLoad
+    {
+        void SetLoadLevel(int level);
+        void Raise();
+        void Lower();
+
+        IntFeedback LoadLevelFeedback { get; }
+        BoolFeedback LoadIsOnFeedback { get; }
+    }
+}

src/PepperDash.Essentials.Core/Lighting/ILightingMasterRaiseLower.cs

@@ -0,0 +1,12 @@
+namespace PepperDash.Essentials.Core.Lighting
+{
+    /// <summary>
+    /// Requirements for a device that implements master raise/lower
+    /// </summary>
+    public interface ILightingMasterRaiseLower
+    {
+        void MasterRaise();
+        void MasterLower();
+        void MasterRaiseLowerStop();
+    }
+}

src/PepperDash.Essentials.Core/Lighting/ILightingScenes.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.Lighting
+{
+    /// <summary>
+    /// Requirements for a device that implements lighting scene control
+    /// </summary>
+    public interface ILightingScenes
+    {
+        event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
+
+        List<LightingScene> LightingScenes { get; }
+
+        void SelectScene(LightingScene scene);
+
+        LightingScene CurrentLightingScene { get; }
+
+    }
+}

src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Lighting
-{
-    /// <summary>
-    /// Requirements for a device that implements lighting scene control
-    /// </summary>
-    public interface ILightingScenes
-    {
-        event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
-        List<LightingScene> LightingScenes { get; }
-
-        void SelectScene(LightingScene scene);
-
-        LightingScene CurrentLightingScene { get; }
-
-    }
-
-    /// <summary>
-    /// Requirements for a device that implements master raise/lower
-    /// </summary>
-    public interface ILightingMasterRaiseLower
-    {
-        void MasterRaise();
-        void MasterLower();
-        void MasterRaiseLowerStop();
-    }
-
-    /// <summary>
-    /// Requiremnts for controlling a lighting load
-    /// </summary>
-    public interface ILightingLoad
-    {
-        void SetLoadLevel(int level);
-        void Raise();
-        void Lower();
-
-        IntFeedback LoadLevelFeedback { get; }
-        BoolFeedback LoadIsOnFeedback { get; }
-    }
-
-    public class LightingSceneChangeEventArgs : EventArgs
-    {
-        public LightingScene CurrentLightingScene { get; private set; }
-
-        public LightingSceneChangeEventArgs(LightingScene scene)
-        {
-            CurrentLightingScene = scene;
-        }
-    }
-
-}

src/PepperDash.Essentials.Core/Lighting/LightingBase.cs

@@ -115,34 +115,4 @@ namespace PepperDash.Essentials.Core.Lighting
         }
 
     }
-
-    public class LightingScene
-    {
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
-        public string Name { get; set; }
-        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
-        public string ID { get; set; }
-        bool _IsActive;
-        [JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
-        public bool IsActive 
-        {
-            get
-            {
-                return _IsActive;
-            }
-            set
-            {
-                _IsActive = value;
-                IsActiveFeedback.FireUpdate();
-            }
-        }
-
-        [JsonIgnore]
-        public BoolFeedback IsActiveFeedback { get; set; }
-
-        public LightingScene()
-        {
-            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        }
-    }
 }

src/PepperDash.Essentials.Core/Lighting/LightingScene.cs

@@ -0,0 +1,35 @@
+using System;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Lighting
+{
+    public class LightingScene
+    {
+        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+        public string Name { get; set; }
+        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+        public string ID { get; set; }
+        bool _IsActive;
+        [JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
+        public bool IsActive 
+        {
+            get
+            {
+                return _IsActive;
+            }
+            set
+            {
+                _IsActive = value;
+                IsActiveFeedback.FireUpdate();
+            }
+        }
+
+        [JsonIgnore]
+        public BoolFeedback IsActiveFeedback { get; set; }
+
+        public LightingScene()
+        {
+            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
+        }
+    }
+}

src/PepperDash.Essentials.Core/Lighting/LightingSceneChangeEventArgs.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Lighting
+{
+    public class LightingSceneChangeEventArgs : EventArgs
+    {
+        public LightingScene CurrentLightingScene { get; private set; }
+
+        public LightingSceneChangeEventArgs(LightingScene scene)
+        {
+            CurrentLightingScene = scene;
+        }
+    }
+
+}

src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs

@@ -8,6 +8,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Interfaces;
 
 
 namespace PepperDash.Essentials.Core.Privacy

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -120,7 +120,25 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bridges\BridgeBase.cs" />
-    <Compile Include="Bridges\IBridge.cs" />
+    <Compile Include="Devices\AudioChangeType.cs" />
+    <Compile Include="Interfaces\IDisplayUsage.cs" />
+    <Compile Include="Interfaces\IBasicVolumeWithFeedback.cs" />
+    <Compile Include="Interfaces\IHasMuteControlWithFeedback.cs" />
+    <Compile Include="Interfaces\IAttachVideoStatus.cs" />
+    <Compile Include="Interfaces\IHasMuteControl.cs" />
+    <Compile Include="Interfaces\IHasVolumeControlWithFeedback.cs" />
+    <Compile Include="Interfaces\IHasVolumeControl.cs" />
+    <Compile Include="Interfaces\IBasicVideoMute.cs" />
+    <Compile Include="Interfaces\IOnline.cs" />
+    <Compile Include="Interfaces\IReceiveVolume.cs" />
+    <Compile Include="Interfaces\ITransmitVolume.cs" />
+    <Compile Include="Interfaces\IBasicVolumeControls.cs" />
+    <Compile Include="Interfaces\IHasSwitchedOutputs.cs" />
+    <Compile Include="DeviceTypeInterfaces\IChannelExtensions.cs" />
+    <Compile Include="DeviceInfo\DeviceInfoChangeHandler.cs" />
+    <Compile Include="InUseTracking\DeviceUsageEventArgs.cs" />
+    <Compile Include="Interfaces\ISetTopBoxNumericKeypad.cs" />
+    <Compile Include="Interfaces\IBridgeAdvanced.cs" />
     <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
@@ -185,12 +203,12 @@
     <Compile Include="Crestron IO\IOPortConfig.cs" />
     <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
-    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
+    <Compile Include="Interfaces\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
-    <Compile Include="Device Info\DeviceInfo.cs" />
-    <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
-    <Compile Include="Device Info\IDeviceInfoProvider.cs" />
-    <Compile Include="Devices\CodecInterfaces.cs" />
+    <Compile Include="DeviceInfo\DeviceInfo.cs" />
+    <Compile Include="DeviceInfo\DeviceInfoEventArgs.cs" />
+    <Compile Include="Interfaces\IDeviceInfoProvider.cs" />
+    <Compile Include="Interfaces\IPrivacy.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DestinationListItem.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
@@ -198,9 +216,9 @@
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\EssentialsDevice.cs" />
     <Compile Include="Devices\GenericIRController.cs" />
-    <Compile Include="Devices\IDspPreset.cs" />
-    <Compile Include="Devices\IProjectorInterfaces.cs" />
-    <Compile Include="Devices\IReconfigurableDevice.cs" />
+    <Compile Include="Interfaces\IDspPreset.cs" />
+    <Compile Include="Interfaces\IBasicVideoMuteWithFeedback.cs" />
+    <Compile Include="Interfaces\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
@@ -209,7 +227,7 @@
     <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
-    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
+    <Compile Include="Interfaces\IHasBranding.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageDefinition.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
@@ -233,8 +251,14 @@
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
     <Compile Include="Global\EthernetAdapterInfo.cs" />
+    <Compile Include="Interfaces\IHasDspPresets.cs" />
     <Compile Include="Interfaces\ILogStrings.cs" />
     <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
+    <Compile Include="Devices\UsageTracking.cs" />
+    <Compile Include="Lighting\ILightingLoad.cs" />
+    <Compile Include="Lighting\ILightingMasterRaiseLower.cs" />
+    <Compile Include="Lighting\ILightingScenes.cs" />
+    <Compile Include="Lighting\LightingScene.cs" />
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
     <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
@@ -248,7 +272,7 @@
     <Compile Include="Global\Scheduler.cs" />
     <Compile Include="Queues\IQueue.cs" />
     <Compile Include="JoinMaps\JoinMapBase.cs" />
-    <Compile Include="Lighting\Lighting Interfaces.cs" />
+    <Compile Include="Lighting\LightingSceneChangeEventArgs.cs" />
     <Compile Include="Lighting\LightingBase.cs" />
     <Compile Include="Monitoring\SystemMonitorController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
@@ -268,7 +292,7 @@
     <Compile Include="Config\InfoConfig.cs" />
     <Compile Include="Config\DeviceConfig.cs" />
     <Compile Include="Devices\DisplayUiConstants.cs" />
-    <Compile Include="Devices\IUsageTracking.cs" />
+    <Compile Include="Interfaces\IUsageTracking.cs" />
     <Compile Include="Devices\DeviceJsonApi.cs" />
     <Compile Include="Devices\SourceListItem.cs" />
     <Compile Include="DeviceTypeInterfaces\IDisplayBasic.cs" />
@@ -282,7 +306,6 @@
     <Compile Include="DeviceTypeInterfaces\IColorFunctions.cs" />
     <Compile Include="DeviceTypeInterfaces\IDPad.cs" />
     <Compile Include="DeviceTypeInterfaces\IDvr.cs" />
-    <Compile Include="DeviceTypeInterfaces\Template.cs" />
     <Compile Include="DeviceTypeInterfaces\ITransport.cs" />
     <Compile Include="Devices\GenericMonitoredTcpDevice.cs" />
     <Compile Include="DeviceTypeInterfaces\INumeric.cs" />
@@ -306,7 +329,7 @@
     <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
     <Compile Include="Routing\ICardPortsDevice.cs" />
-    <Compile Include="InUseTracking\IInUseTracking.cs" />
+    <Compile Include="Interfaces\IInUseTracking.cs" />
     <Compile Include="InUseTracking\InUseTracking.cs" />
     <Compile Include="Routing\IRoutingInputsExtensions.cs" />
     <Compile Include="Monitoring\StatusMonitorCollection.cs" />
@@ -314,9 +337,9 @@
     <Compile Include="Monitoring\StatusMonitorBase.cs" />
     <Compile Include="Monitoring\Interfaces.cs" />
     <Compile Include="Monitoring\GenericCommunicationMonitor.cs" />
-    <Compile Include="Devices\AudioInterfaces.cs" />
+    <Compile Include="Devices\AudioChangeEventArgs.cs" />
     <Compile Include="Devices\IAttachVideoStatusExtensions.cs" />
-    <Compile Include="Devices\IHasFeedbacks.cs" />
+    <Compile Include="Interfaces\IHasFeedbacks.cs" />
     <Compile Include="Devices\SmartObjectBaseTypes.cs" />
     <Compile Include="Devices\PresentationDeviceType.cs" />
     <Compile Include="Display\MockDisplay.cs" />
@@ -363,7 +386,6 @@
     <Compile Include="Utilities\ActionSequence.cs" />
     <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
     <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
-    <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
     <Compile Include="Devices\DeviceManager.cs" />
     <Compile Include="Devices\IrOutputPortController.cs" />
     <Compile Include="Display\DisplayBase.cs" />
@@ -372,7 +394,7 @@
     <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
     <Compile Include="Touchpanels\ModalDialog.cs" />
     <Compile Include="TriListBridges\HandlerBridge.cs" />
-    <Compile Include="Devices\FIND HOMES Interfaces.cs" />
+    <Compile Include="Interfaces\IMakeModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SigHelper.cs" />
     <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceList.cs" />

src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs

@@ -58,6 +58,7 @@ namespace PepperDash.Essentials
 
             Debug.Console(2, "Found {0} Assemblies", assemblyFiles.Length);
 
+            //TODO update assembly names here
             foreach (var fi in assemblyFiles)
             {
                 string version = string.Empty;

src/PepperDash.Essentials.Core/Presets/DevicePresets.cs

@@ -8,6 +8,7 @@ using PepperDash.Core;
 
 //using SSMono.IO;
 using PepperDash.Core.WebApi.Presets;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core.Presets
 {

src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs

@@ -12,6 +12,7 @@ using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 using Newtonsoft.Json;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Core
 {

src/PepperDash.Essentials.Core/Room/IEssentialsRoom.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Core.Devices;
 

src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs

@@ -7,7 +7,7 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 
 namespace PepperDash.Essentials.Devices.Common

src/PepperDash.Essentials.Devices.Common/AudioCodec/AudioCodecBase.cs

@@ -6,6 +6,8 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Devices.Common.Codec;
 
 namespace PepperDash.Essentials.Devices.Common.AudioCodec

src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs

@@ -8,6 +8,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Devices.Common.Codec;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp.Reflection;

src/PepperDash.Essentials.Devices.Common/Codec/iCodecAudio.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {

src/PepperDash.Essentials.Devices.Common/DSP/BiampTesira/BiampTesiraForteDspLevel.cs

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using System.Text.RegularExpressions;
+using PepperDash.Essentials.Core.Interfaces;
 
 
 namespace PepperDash.Essentials.Devices.Common.DSP

src/PepperDash.Essentials.Devices.Common/DiscPlayer/IRDiscPlayerBase.cs

@@ -11,6 +11,8 @@ using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;

src/PepperDash.Essentials.Devices.Common/Display/AvocorVTFDisplay.cs

@@ -10,6 +10,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 

src/PepperDash.Essentials.Devices.Common/Display/NECPSXMDisplay.cs

@@ -9,6 +9,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 

src/PepperDash.Essentials.Devices.Common/Display/PanasonicThDisplay.cs

@@ -9,6 +9,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 

src/PepperDash.Essentials.Devices.Common/Display/SamsungMDCDisplay.cs

@@ -10,6 +10,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 

src/PepperDash.Essentials.Devices.Common/Environment/Crestron Lighting/Din8sw8.cs

@@ -11,10 +11,11 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.Environment.Lighting
 {
-    public class Din8sw8Controller : EssentialsDevice, ISwitchedOutputCollection
+    public class Din8sw8Controller : EssentialsDevice, IHasSwitchedOutputs
     {
         // Need to figure out some sort of interface to make these switched outputs behave like processor relays so they can be used interchangably
 

src/PepperDash.Essentials.Devices.Common/Environment/Somfy/RelayControlledShade.cs

@@ -8,6 +8,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Shades;
 
 namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
@@ -87,7 +88,7 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
 
             if (portDevice != null)
             {
-                return (portDevice as ISwitchedOutputCollection).SwitchedOutputs[relayConfig.PortNumber];
+                return (portDevice as IHasSwitchedOutputs).SwitchedOutputs[relayConfig.PortNumber];
             }
             else
             {

src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs

@@ -9,6 +9,8 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 
 namespace PepperDash.Essentials.Devices.Common

src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs

@@ -10,6 +10,8 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;

src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Config;

src/PepperDash.Essentials.Devices.Common/VideoCodec/CiscoCodec/CiscoCamera.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco

src/PepperDash.Essentials.Devices.Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -14,6 +14,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;

src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasVideoCodec.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {

src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVCCamera.cs

@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras

src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs

@@ -15,6 +15,7 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;

src/PepperDash.Essentials.Devices.Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

src/PepperDash.Essentials.Devices.DM/Chassis/DmCardAudioOutput.cs

@@ -7,6 +7,7 @@ using Crestron.SimplSharpPro.DM;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.DM
 {

src/PepperDash.Essentials.Devices.DM/Chassis/DmpsAudioOutputController.cs

@@ -11,6 +11,7 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 using PepperDash.Essentials.DM.Config;
 
 

src/PepperDash.Essentials.Devices.DM/Chassis/DmpsMicrophoneController.cs

@@ -8,6 +8,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Interfaces;
 
 
 namespace PepperDash.Essentials.DM

src/PepperDash.Essentials.Devices.DM/Endpoints/DGEs/Dge100Controller.cs

@@ -17,6 +17,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Essentials.Core.DeviceInfo;
+using PepperDash.Essentials.Core.Interfaces;
 
 namespace PepperDash.Essentials.DM.Endpoints.DGEs
 {