Mega refactor in progress

PepperDashEssentials/AppServer/Interfaces.cs

@@ -19,42 +19,3 @@ namespace PepperDash.Essentials.Room.Cotija
 	}
 }
 
-namespace PepperDash.Essentials
-{
-	/// <summary>
-	/// For rooms with a single presentation source, change event
-	/// </summary>
-	public interface IHasCurrentSourceInfoChange
-	{
-		string CurrentSourceInfoKey { get; }
-		SourceListItem CurrentSourceInfo { get; }
-		event SourceInfoChangeHandler CurrentSingleSourceChange;
-	}
-
-
-	/// <summary>
-	/// For rooms with routing
-	/// </summary>
-	public interface IRunRouteAction
-	{
-		void RunRouteAction(string routeKey);
-
-		void RunRouteAction(string routeKey, Action successCallback);
-	}
-
-	/// <summary>
-	/// For rooms that default presentation only routing
-	/// </summary>
-	public interface IRunDefaultPresentRoute
-	{
-		bool RunDefaultPresentRoute();
-	}
-
-	/// <summary>
-	/// For rooms that have default presentation and calling routes
-	/// </summary>
-	public interface IRunDefaultCallRoute : IRunDefaultPresentRoute
-	{
-		bool RunDefaultCallRoute();
-	}
-}

PepperDashEssentials/AppServer/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs

@@ -93,7 +93,7 @@ namespace PepperDash.Essentials
 
 			var sscRoom = Room as IHasCurrentSourceInfoChange;
 			if(sscRoom != null)
-				sscRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
+				sscRoom.CurrentSingleDisplaySourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);
 
 			var vcRoom = Room as IHasVideoCodec;
 			if (vcRoom != null && vcRoom.VideoCodec != null)

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -14,6 +14,7 @@ using PepperDash.Core;
 using PepperDash.Essentials;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Core.Fusion;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.Occupancy;
 
@@ -181,7 +182,7 @@ namespace PepperDash.Essentials.Fusion
             // Moved to 
             CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as EssentialsHuddleVtc1Room).CurrentSingleSourceChange += Room_CurrentSourceInfoChange;
+            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
             FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
@@ -220,7 +221,7 @@ namespace PepperDash.Essentials.Fusion
                         break;
                 }
 
-                var laptops = dict.Where(d => d.Value.SourceDevice is Laptop);
+                var laptops = dict.Where(d => d.Value.SourceDevice is Core.Devices.Laptop);
                 i = 1;
                 foreach (var kvp in laptops)
                 {

PepperDashEssentials/PepperDashEssentials.csproj

@@ -173,16 +173,11 @@
     <Compile Include="Devices\NUMERIC AppleTV.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Factory\UiDeviceFactory.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\EssentialsHuddleVtc1FusionController.cs" />
+    <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionCustomPropertiesBridge.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionEventHandlers.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionProcessorQueries.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\FusionRviDataClasses.cs" />
     <Compile Include="REMOVE EssentialsApp.cs" />
-    <Compile Include="FOR REFERENCE UI\OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
     <Compile Include="HttpApiHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
@@ -206,10 +201,10 @@
     <Compile Include="AppServer\RoomBridges\SourceDeviceMapDictionary.cs" />
     <Compile Include="AppServer\Volumes.cs" />
     <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
+    <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
     <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
     <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
     <Compile Include="Room\Types\EssentialsPresentationRoom.cs" />
-    <Compile Include="Room\Types\EssentialsRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
     <Compile Include="FOR REFERENCE UI\PageControllers\DevicePageControllerBase.cs" />
     <Compile Include="FOR REFERENCE UI\PageControllers\PageControllerLaptop.cs" />
@@ -273,6 +268,9 @@
       <Name>Essentials Devices Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FOR REFERENCE UI\OTHER\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

PepperDashEssentials/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    public class EssentialsDualDisplayRoomPropertiesConfig : EssentialsNDisplayRoomPropertiesConfig
+    {
+
+        public const string LeftDisplayId = "leftDisplay";
+        public const string RightDisplayId = "rightDisplay";
+    }
+}

PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs

@@ -8,19 +8,10 @@ using Newtonsoft.Json;
 namespace PepperDash.Essentials.Room.Config
 {
 
-    public class EssentialsHuddleVtc1PropertiesConfig : EssentialsRoomPropertiesConfig
+    public class EssentialsHuddleVtc1PropertiesConfig : EssentialsConferenceRoomPropertiesConfig
     {
 		[JsonProperty("defaultDisplayKey")]
 		public string DefaultDisplayKey { get; set; }
-		[JsonProperty("defaultAudioKey")]
+
-		public string DefaultAudioKey { get; set; }
-		[JsonProperty("sourceListKey")]
-		public string SourceListKey { get; set; }
-		[JsonProperty("defaultSourceItem")]
-		public string DefaultSourceItem { get; set; }
-		[JsonProperty("videoCodecKey")]
-		public string VideoCodecKey { get; set; }
-		[JsonProperty("audioCodecKey")]
-		public string AudioCodecKey { get; set; }
     }
 }

PepperDashEssentials/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs

@@ -4,22 +4,27 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
+using Newtonsoft.Json;
+
 namespace PepperDash.Essentials.Room.Config
 {
     /// <summary>
     /// 
     /// </summary>
-    public class EssentialsNDisplayRoomPropertiesConfig : EssentialsRoomPropertiesConfig
+    public class EssentialsNDisplayRoomPropertiesConfig : EssentialsConferenceRoomPropertiesConfig
     {
+        [JsonProperty("defaultAudioBehavior")]
         public string DefaultAudioBehavior { get; set; }
-        public string DefaultAudioKey { get; set; }
+        [JsonProperty("defaultVideoBehavior")]
         public string DefaultVideoBehavior { get; set; }
+        [JsonProperty("displays")]
         public Dictionary<string, string> Displays { get; set; }
-        public string SourceListKey { get; set; }
 
         public EssentialsNDisplayRoomPropertiesConfig()
         {
             Displays = new Dictionary<string, string>();
         }
+
     }
+
 }

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -76,7 +76,7 @@ namespace PepperDash.Essentials.Room.Config
 			}
 			// Get the MicrophonePrivacy device from the device manager
 			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as
-				PepperDash.Essentials.Devices.Common.Microphones.MicrophonePrivacyController);
+				Core.Privacy.MicrophonePrivacyController);
 			// Set this room as the IPrivacy device
 			if (mP == null)
 			{
@@ -175,6 +175,25 @@ namespace PepperDash.Essentials.Room.Config
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 	}
 
+    public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
+    {
+        [JsonProperty("defaultAudioKey")]
+        public string DefaultAudioKey { get; set; }
+        [JsonProperty("sourceListKey")]
+        public string SourceListKey { get; set; }
+        [JsonProperty("defaultSourceItem")]
+        public string DefaultSourceItem { get; set; }
+
+    }
+
+    public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
+    {
+        [JsonProperty("videoCodecKey")]
+        public string VideoCodecKey { get; set; }
+        [JsonProperty("audioCodecKey")]
+        public string AudioCodecKey { get; set; }
+    }
+
 	public class EssentialsEnvironmentPropertiesConfig
 	{
 		public bool Enabled { get; set; }

PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs

@@ -12,15 +12,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials.Room
 {
-    public abstract class EssentialsRoomEmergencyBase : IKeyed
-    {
-        public string Key { get; private set; }
 
-        public EssentialsRoomEmergencyBase(string key)
-        {
-            Key = key;
-        }
-    }
 
 
     public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.AudioCodec;
+
+namespace PepperDash.Essentials.Room.Types
+{
+    public class EssentialsDualDisplayRoom : EssentialsNDisplayRoomBase, IHasCurrentVolumeControls, 
+        IRunRouteAction, IPrivacy, IPrivacy, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec
+    {
+        public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+
+        public EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; private set; }
+
+        //************************
+        // Call-related stuff
+
+        public BoolFeedback InCallFeedback { get; private set; }
+
+        /// <summary>
+        /// States: 0 for on hook, 1 for video, 2 for audio, 3 for telekenesis
+        /// </summary>
+        public IntFeedback CallTypeFeedback { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public BoolFeedback PrivacyModeIsOnFeedback { get; private set; }
+
+        /// <summary>
+        /// When something in the room is sharing with the far end or through other means
+        /// </summary>
+        public BoolFeedback IsSharingFeedback { get; private set; }
+
+        IRoutingSinkWithSwitching LeftDisplay { get; private set; }
+        IRoutingSinkWithSwitching RightDisplay { get; private set; }
+
+
+        protected override Func<bool> OnFeedbackFunc
+        {
+            get
+            {
+                return () =>
+                {
+                    var leftDisp = LeftDisplay as DisplayBase;
+                    var rightDisp = RightDisplay as DisplayBase;
+                    var val = leftDisp != null && leftDisp.CurrentSourceInfo != null
+                        && leftDisp.CurrentSourceInfo.Type == eSourceListItemType.Route
+                        && rightDisp != null && rightDisp.CurrentSourceInfo != null
+                        && rightDisp.CurrentSourceInfo.Type == eSourceListItemType.Route;
+                    return val;
+                };
+            }
+        }
+    }
+}

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -16,7 +16,7 @@ namespace PepperDash.Essentials
 	public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
+		public event SourceInfoChangeHandler CurrentSourceChange;
 
         protected override Func<bool> OnFeedbackFunc
         {
@@ -76,11 +76,6 @@ namespace PepperDash.Essentials
 
 		public bool ExcludeFromGlobalFunctions { get; set; }
 
-		/// <summary>
-		/// The config name of the source list
-		/// </summary>
-		public string SourceListKey { get; set; }
-
         public string DefaultSourceItem { get; set; }
 
         public ushort DefaultVolume { get; set; }
@@ -128,7 +123,7 @@ namespace PepperDash.Essentials
 			{
 				if (value == _CurrentSourceInfo) return;
 
-				var handler = CurrentSingleSourceChange;
+				var handler = CurrentSourceChange;
 				// remove from in-use tracker, if so equipped
 				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
@@ -251,7 +246,7 @@ namespace PepperDash.Essentials
             // Add Occupancy object from config
             if (PropertiesConfig.Occupancy != null)
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                    PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
             this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials
 		IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-		public event SourceInfoChangeHandler CurrentSingleSourceChange;
+		public event SourceInfoChangeHandler CurrentSourceChange;
 
 
         //************************
@@ -166,7 +166,7 @@ namespace PepperDash.Essentials
 			{
 				if (value == _CurrentSourceInfo) return;
 
-				var handler = CurrentSingleSourceChange;
+				var handler = CurrentSourceChange;
 				// remove from in-use tracker, if so equipped
 				if(_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
 					(_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
@@ -330,7 +330,7 @@ namespace PepperDash.Essentials
             // Add Occupancy object from config
             if (PropertiesConfig.Occupancy != null)
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
-                    PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
+                    IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
             this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;

PepperDashEssentials/Room/Types/EssentialsNDisplayRoomBase.cs

@@ -19,13 +19,10 @@ namespace PepperDash.Essentials.Room.Types
     /// </summary>
     public abstract class EssentialsNDisplayRoomBase : EssentialsRoomBase
     {
-        public event SourceInfoChangeHandler CurrentSingleSourceChange;
+        //public event SourceInfoChangeHandler CurrentSingleSourceChange;
 
         public Dictionary<string, IRoutingSinkWithSwitching> Displays { get; protected set; }
 
-        protected override Func<bool> IsWarmingFeedbackFunc { get { return () => false; ; } }
-        protected override Func<bool> IsCoolingFeedbackFunc { get { return () => false; } }
-
         public EssentialsNDisplayRoomBase(DeviceConfig config)
             : base (config)
         {

PepperDashEssentials/UI/SubpageReferenceListSourceItem.cs

@@ -25,8 +25,8 @@ namespace PepperDash.Essentials
 
         public void RegisterForSourceChange(IHasCurrentSourceInfoChange room)
         {
-            room.CurrentSingleSourceChange -= room_CurrentSourceInfoChange;
+            room.CurrentSingleDisplaySourceChange -= room_CurrentSourceInfoChange;
-            room.CurrentSingleSourceChange += room_CurrentSourceInfoChange;
+            room.CurrentSingleDisplaySourceChange += room_CurrentSourceInfoChange;
         }
 
         void room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -733,7 +733,7 @@ namespace PepperDash.Essentials
                 // Disconnect current room
                 _CurrentRoom.CurrentVolumeDeviceChange -= this.CurrentRoom_CurrentAudioDeviceChange;
                 ClearAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange -= this.CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange -= this.CurrentRoom_SourceInfoChange;
                 DisconnectSource(_CurrentRoom.CurrentSourceInfo);
                 _CurrentRoom.ShutdownPromptTimer.HasStarted -= ShutdownPromptTimer_HasStarted;
                 _CurrentRoom.ShutdownPromptTimer.HasFinished -= ShutdownPromptTimer_HasFinished;
@@ -803,7 +803,7 @@ namespace PepperDash.Essentials
 
                 _CurrentRoom.CurrentVolumeDeviceChange += CurrentRoom_CurrentAudioDeviceChange;
                 RefreshAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange += CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
                 (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -885,7 +885,7 @@ namespace PepperDash.Essentials
                 // Disconnect current room
                 _CurrentRoom.CurrentVolumeDeviceChange -= this.CurrentRoom_CurrentAudioDeviceChange;
                 ClearAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange -= this.CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange -= this.CurrentRoom_SourceInfoChange;
                 DisconnectSource(_CurrentRoom.CurrentSourceInfo);
                 _CurrentRoom.ShutdownPromptTimer.HasStarted -= ShutdownPromptTimer_HasStarted;
                 _CurrentRoom.ShutdownPromptTimer.HasFinished -= ShutdownPromptTimer_HasFinished;
@@ -924,7 +924,7 @@ namespace PepperDash.Essentials
 
                 _CurrentRoom.CurrentVolumeDeviceChange += CurrentRoom_CurrentAudioDeviceChange;
                 RefreshAudioDeviceConnections();
-                _CurrentRoom.CurrentSingleSourceChange += CurrentRoom_SourceInfoChange;
+                _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
                 if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
@@ -939,7 +939,7 @@ namespace PepperDash.Essentials
                 SetActiveCallListSharingContentStatus();
 
                 if (_CurrentRoom != null)
-                    _CurrentRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
+                    _CurrentRoom.CurrentSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
                 TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd"));
 

PepperDashEssentials/UIDrivers/SmartObjectRoomsList.cs

@@ -64,7 +64,7 @@ namespace PepperDash.Essentials
 			parent.SetItemMainText(index, room.Name);
 			UpdateItem(room.CurrentSourceInfo);
 			// Watch for later changes
-			room.CurrentSingleSourceChange += new SourceInfoChangeHandler(room_CurrentSourceInfoChange);
+			room.CurrentSourceChange += new SourceInfoChangeHandler(room_CurrentSourceInfoChange);
 			parent.SetItemButtonAction(index, buttonAction);
 		}
 

PepperDashEssentials/UIDrivers/SourceChangeArgs.cs

@@ -9,8 +9,8 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials
 {
-    /// <summary>
+    ///// <summary>
-    /// The handler type for a Room's SourceInfoChange
+    ///// The handler type for a Room's SourceInfoChange
-    /// </summary>
+    ///// </summary>
-    public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
+    //public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/PC/InRoomPc.cs

@@ -7,7 +7,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Devices.Common
+namespace PepperDash.Essentials.Core.Devices
 {
 	/// <summary>
 	/// This DVD class should cover most IR, one-way DVD and Bluray fuctions

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/PC/Laptop.cs

@@ -7,7 +7,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Devices.Common
+namespace PepperDash.Essentials.Core.Devices
 {
 	/// <summary>
 	/// This DVD class should cover most IR, one-way DVD and Bluray fuctions

essentials-framework/Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -18,6 +18,11 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public abstract class DisplayBase : Device, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
 	{
+        public event SourceInfoChangeHandler CurrentSourceChange;
+
+        public string CurrentSourceInfoKey { get; protected set; }
+        public SourceListItem CurrentSourceInfo { get; protected set; }
+
 		public BoolFeedback PowerIsOnFeedback { get; protected set; }
 		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
 		public BoolFeedback IsWarmingUpFeedback { get; private set; }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -18,12 +18,10 @@ using PepperDash.Core;
 using PepperDash.Essentials;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Devices.Common;
-using PepperDash.Essentials.Devices.Common.Occupancy;
 
 
 
-namespace PepperDash.Essentials.Fusion
+namespace PepperDash.Essentials.Core.Fusion
 {
 	public class EssentialsHuddleSpaceFusionSystemControllerBase : Device, IOccupancyStatusProvider
 	{
@@ -330,11 +328,11 @@ namespace PepperDash.Essentials.Fusion
             // Moved to 
 			CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
 			// Don't think we need to get current status of this as nothing should be alive yet. 
-			(Room as EssentialsHuddleSpaceRoom).CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSourceInfoChange);
+			(Room as IHasCurrentSourceInfoChange).CurrentSourceChange += new SourceInfoChangeHandler(Room_CurrentSourceInfoChange);
 
 
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleSpaceRoom).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsRoomBase).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"));
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IRunRouteAction).RunRouteAction("roomOff"));
 			// NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
 			FusionRoom.ErrorMessage.InputSig.StringValue =
 				"3: 7 Errors: This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;";
@@ -990,7 +988,7 @@ namespace PepperDash.Essentials.Fusion
 		protected virtual void SetUpSources()
 		{
 			// Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleSpaceRoom).SourceListKey);
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsRoomBase).SourceListKey);
 			if (dict != null)
 			{
 				// NEW PROCESS:
@@ -1015,7 +1013,7 @@ namespace PepperDash.Essentials.Fusion
 						break;
 				}
 
-				var laptops = dict.Where(d => d.Value.SourceDevice is Laptop);
+				var laptops = dict.Where(d => d.Value.SourceDevice is Devices.Laptop);
 				i = 1;
 				foreach (var kvp in laptops)
 				{
@@ -1041,7 +1039,7 @@ namespace PepperDash.Essentials.Fusion
 			else
 			{
 				Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as EssentialsHuddleSpaceRoom).SourceListKey, Room.Key);
+                    (Room as EssentialsRoomBase).SourceListKey, Room.Key);
 			}
 		}
 
@@ -1088,7 +1086,7 @@ namespace PepperDash.Essentials.Fusion
 				SourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
 
 				// And respond to selection in Fusion
-                sigD.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleSpaceRoom).RunRouteAction(routeKey));
+                sigD.OutputSig.SetSigFalseAction(() => (Room as IRunRouteAction).RunRouteAction(routeKey));
 			}
 			catch (Exception)
 			{
@@ -1290,7 +1288,7 @@ namespace PepperDash.Essentials.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IRunRouteAction).RunRouteAction("roomOff"); }); ;
             }
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/FusionCustomPropertiesBridge.cs

@@ -10,9 +10,8 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Room.Behaviours;
 
-namespace PepperDash.Essentials.Fusion
+namespace PepperDash.Essentials.Core.Fusion
 {
     /// <summary>
     /// Handles mapping Fusion Custom Property values to system properties

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/FusionEventHandlers.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Essentials.Fusion
+namespace PepperDash.Essentials.Core.Fusion
 {
     public class ScheduleChangeEventArgs : EventArgs
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/FusionProcessorQueries.cs

@@ -4,9 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Fusion
+namespace PepperDash.Essentials.Core.Fusion
 {
     /// <summary>
     /// When created, runs progcomments on every slot and stores the program names in a list

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/FusionRviDataClasses.cs

@@ -7,7 +7,7 @@ using Crestron.SimplSharpPro.Fusion;
 
 using PepperDash.Core;
 
-namespace PepperDash.Essentials.Fusion
+namespace PepperDash.Essentials.Core.Fusion
 {
     // Helper Classes for GUIDs
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/MOVED FusionSystemController.cs

@@ -1,377 +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 Crestron.SimplSharpPro.Fusion;
-//using PepperDash.Essentials.Core;
-
-//using PepperDash.Core;
-
-
-//namespace PepperDash.Essentials.Core.Fusion
-//{
-//    public class EssentialsHuddleSpaceFusionSystemController : Device
-//    {
-//        FusionRoom FusionRoom;
-//        Room Room;
-//        Dictionary<IPresentationSource, BoolInputSig> SourceToFeedbackSigs = new Dictionary<IPresentationSource, BoolInputSig>();
-
-//        StatusMonitorCollection ErrorMessageRollUp;
-
-//        public EssentialsHuddleSpaceFusionSystemController(HuddleSpaceRoom room, uint ipId)
-//            : base(room.Key + "-fusion")
-//        {
-//            Room = room;
-
-//            FusionRoom = new FusionRoom(ipId, Global.ControlSystem, room.Name, "awesomeGuid-" + room.Key);
-//            FusionRoom.Register();
-
-//            FusionRoom.FusionStateChange += new FusionStateEventHandler(FusionRoom_FusionStateChange);
-
-//            // Room to fusion room
-//            room.RoomIsOn.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
-//            var srcName = FusionRoom.CreateOffsetStringSig(50, "Source - Name", eSigIoMask.InputSigOnly);
-//            room.CurrentSourceName.LinkInputSig(srcName.InputSig);
-
-//            FusionRoom.SystemPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (b) room.RoomOn(null); });
-//            FusionRoom.SystemPowerOff.OutputSig.UserObject = new Action<bool>(b => { if (b) room.RoomOff(); });
-//            // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
-//            FusionRoom.ErrorMessage.InputSig.StringValue = "3: 7 Errors: This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;";
-
-//            // Sources
-//            foreach (var src in room.Sources)
-//            {
-//                var srcNum = src.Key;
-//                var pSrc = src.Value as IPresentationSource;
-//                var keyNum = ExtractNumberFromKey(pSrc.Key);
-//                if (keyNum == -1)
-//                {
-//                    Debug.Console(1, this, "WARNING: Cannot link source '{0}' to numbered Fusion attributes", pSrc.Key);
-//                    continue;
-//                }
-//                string attrName = null;
-//                uint attrNum = Convert.ToUInt32(keyNum);
-//                switch (pSrc.Type)
-//                {
-//                    case PresentationSourceType.None:
-//                        break;
-//                    case PresentationSourceType.SetTopBox:
-//                        attrName = "Source - TV " + keyNum;
-//                        attrNum += 115;	// TV starts at 116
-//                        break;
-//                    case PresentationSourceType.Dvd:
-//                        attrName = "Source - DVD " + keyNum;
-//                        attrNum += 120; // DVD starts at 121
-//                        break;
-//                    case PresentationSourceType.PC:
-//                        attrName = "Source - PC " + keyNum;
-//                        attrNum += 110; // PC starts at 111
-//                        break;
-//                    case PresentationSourceType.Laptop:
-//                        attrName = "Source - Laptop " + keyNum;
-//                        attrNum += 100; // Laptops start at 101
-//                        break;
-//                    case PresentationSourceType.VCR:
-//                        attrName = "Source - VCR " + keyNum;
-//                        attrNum += 125; // VCRs start at 126
-//                        break;
-//                }
-//                if (attrName == null)
-//                {
-//                    Debug.Console(1, this, "Source type {0} does not have corresponsing Fusion attribute type, skipping", pSrc.Type);
-//                    continue;
-//                }
-//                Debug.Console(2, this, "Creating attribute '{0}' with join {1} for source {2}", attrName, attrNum, pSrc.Key);
-//                var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputOutputSig);
-//                // Need feedback when this source is selected
-//                // Event handler, added below, will compare source changes with this sig dict
-//                SourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
-
-//                // And respond to selection in Fusion
-//                sigD.OutputSig.UserObject = new Action<bool>(b => { if(b) room.SelectSource(pSrc); });
-//            }
-
-//            // Attach to all room's devices with monitors.
-//            //foreach (var dev in DeviceManager.Devices)
-//            foreach (var dev in DeviceManager.GetDevices())
-//            {
-//                if (!(dev is ICommunicationMonitor))
-//                    continue;
-
-//                var keyNum = ExtractNumberFromKey(dev.Key);
-//                if (keyNum == -1)
-//                {
-//                    Debug.Console(1, this, "WARNING: Cannot link device '{0}' to numbered Fusion monitoring attributes", dev.Key);
-//                    continue;
-//                }
-//                string attrName = null;
-//                uint attrNum = Convert.ToUInt32(keyNum);
-
-//                //if (dev is SmartGraphicsTouchpanelControllerBase)
-//                //{
-//                //    if (attrNum > 10)
-//                //        continue;
-//                //    attrName = "Device Ok - Touch Panel " + attrNum;
-//                //    attrNum += 200;
-//                //}
-//                //// add xpanel here
-
-//                //else 
-//                    if (dev is DisplayBase)
-//                {
-//                    if (attrNum > 10)
-//                        continue;
-//                    attrName = "Device Ok - Display " + attrNum;
-//                    attrNum += 240;
-//                }
-//                //else if (dev is DvdDeviceBase)
-//                //{
-//                //    if (attrNum > 5)
-//                //        continue;
-//                //    attrName = "Device Ok - DVD " + attrNum;
-//                //    attrNum += 260;
-//                //}
-//                // add set top box
-
-//                // add Cresnet roll-up
-
-//                // add DM-devices roll-up
-
-//                if (attrName != null)
-//                {
-//                    // Link comm status to sig and update
-//                    var sigD = FusionRoom.CreateOffsetBoolSig(attrNum, attrName, eSigIoMask.InputSigOnly);
-//                    var smd = dev as ICommunicationMonitor;
-//                    sigD.InputSig.BoolValue = smd.CommunicationMonitor.Status == MonitorStatus.IsOk;
-//                    smd.CommunicationMonitor.StatusChange += (o, a) => { sigD.InputSig.BoolValue = a.Status == MonitorStatus.IsOk; };
-//                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", dev.Key, attrName);
-//                }
-//            }
-
-//            // Don't think we need to get current status of this as nothing should be alive yet. 
-//            room.PresentationSourceChange += Room_PresentationSourceChange;
-
-//            // these get used in multiple places
-//            var display = room.Display;
-//            var dispPowerOnAction = new Action<bool>(b => { if (!b) display.PowerOn(); });
-//            var dispPowerOffAction = new Action<bool>(b => { if (!b) display.PowerOff(); });
-
-//            // Display to fusion room sigs
-//            FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
-//            FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
-//            display.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
-//            if (display is IDisplayUsage)
-//                (display as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-
-//            // Roll up ALL device errors
-//            ErrorMessageRollUp = new StatusMonitorCollection(this);
-//            foreach (var dev in DeviceManager.GetDevices())
-//            {
-//                var md = dev as ICommunicationMonitor;
-//                if (md != null)
-//                {
-//                    ErrorMessageRollUp.AddMonitor(md.CommunicationMonitor);
-//                    Debug.Console(2, this, "Adding '{0}' to room's overall error monitor", md.CommunicationMonitor.Parent.Key);
-//                }
-//            }
-//            ErrorMessageRollUp.Start();
-//            FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message;
-//            ErrorMessageRollUp.StatusChange += (o, a) => {
-//                FusionRoom.ErrorMessage.InputSig.StringValue = ErrorMessageRollUp.Message; };
-
-
-//            // static assets --------------- testing
-
-//            // test assets --- THESE ARE BOTH WIRED TO AssetUsage somewhere internally.
-//            var ta1 = FusionRoom.CreateStaticAsset(1, "Test asset 1", "Awesome Asset", "Awesome123");
-//            ta1.AssetError.InputSig.StringValue = "This should be error";
-
-
-//            var ta2 = FusionRoom.CreateStaticAsset(2, "Test asset 2", "Awesome Asset", "Awesome1232");
-//            ta2.AssetUsage.InputSig.StringValue = "This should be usage";
-			
-
-//            // Make a display asset
-//            var dispAsset = FusionRoom.CreateStaticAsset(3, display.Name, "Display", "awesomeDisplayId" + room.Key);
-//            dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
-//            dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
-//            display.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
-//            // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
-//            // Use extension methods
-//            dispAsset.TrySetMakeModel(display);
-//            dispAsset.TryLinkAssetErrorToCommunication(display);
-		
-
-//            // Make it so!
-//            FusionRVI.GenerateFileForAllFusionDevices();
-//        }
-
-//        /// <summary>
-//        /// Helper to get the number from the end of a device's key string
-//        /// </summary>
-//        /// <returns>-1 if no number matched</returns>
-//        int ExtractNumberFromKey(string key)
-//        {
-//            var capture = System.Text.RegularExpressions.Regex.Match(key, @"\D+(\d+)");
-//            if (!capture.Success)
-//                return -1;
-//            else return Convert.ToInt32(capture.Groups[1].Value);
-//        }
-
-//        void Room_PresentationSourceChange(object sender, EssentialsRoomSourceChangeEventArgs e)
-//        {
-//            if (e.OldSource != null)
-//            {
-//                if (SourceToFeedbackSigs.ContainsKey(e.OldSource))
-//                    SourceToFeedbackSigs[e.OldSource].BoolValue = false;
-//            }
-//            if (e.NewSource != null)
-//            {
-//                if (SourceToFeedbackSigs.ContainsKey(e.NewSource))
-//                    SourceToFeedbackSigs[e.NewSource].BoolValue = true;
-//            }
-//        }
-
-//        void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventArgs args)
-//        {
-
-//            // The sig/UO method: Need separate handlers for fixed and user sigs, all flavors, 
-//            // even though they all contain sigs.
-
-//            var sigData = (args.UserConfiguredSigDetail as BooleanSigDataFixedName);
-//            if (sigData != null)
-//            {
-//                var outSig = sigData.OutputSig;
-//                if (outSig.UserObject is Action<bool>)
-//                    (outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
-//                else if (outSig.UserObject is Action<ushort>)
-//                    (outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
-//                else if (outSig.UserObject is Action<string>)
-//                    (outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
-//                return;
-//            }
-
-//            var attrData = (args.UserConfiguredSigDetail as BooleanSigData);
-//            if (attrData != null)
-//            {
-//                var outSig = attrData.OutputSig;
-//                if (outSig.UserObject is Action<bool>)
-//                    (outSig.UserObject as Action<bool>).Invoke(outSig.BoolValue);
-//                else if (outSig.UserObject is Action<ushort>)
-//                    (outSig.UserObject as Action<ushort>).Invoke(outSig.UShortValue);
-//                else if (outSig.UserObject is Action<string>)
-//                    (outSig.UserObject as Action<string>).Invoke(outSig.StringValue);
-//                return;
-//            }			
-
-//        }
-//    }
-
-
-//    public static class FusionRoomExtensions
-//    {
-//        /// <summary>
-//        /// Creates and returns a fusion attribute. The join number will match the established Simpl
-//        /// standard of 50+, and will generate a 50+ join in the RVI. It calls
-//        /// FusionRoom.AddSig with join number - 49
-//        /// </summary>
-//        /// <returns>The new attribute</returns>
-//        public static BooleanSigData CreateOffsetBoolSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-//        {
-//            if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-//            number -= 49;
-//            fr.AddSig(eSigType.Bool, number, name, mask);
-//            return fr.UserDefinedBooleanSigDetails[number];
-//        }
-
-//        /// <summary>
-//        /// Creates and returns a fusion attribute. The join number will match the established Simpl
-//        /// standard of 50+, and will generate a 50+ join in the RVI. It calls
-//        /// FusionRoom.AddSig with join number - 49
-//        /// </summary>
-//        /// <returns>The new attribute</returns>
-//        public static UShortSigData CreateOffsetUshortSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-//        {
-//            if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-//            number -= 49;
-//            fr.AddSig(eSigType.UShort, number, name, mask);
-//            return fr.UserDefinedUShortSigDetails[number];
-//        }
-
-//        /// <summary>
-//        /// Creates and returns a fusion attribute. The join number will match the established Simpl
-//        /// standard of 50+, and will generate a 50+ join in the RVI. It calls
-//        /// FusionRoom.AddSig with join number - 49
-//        /// </summary>
-//        /// <returns>The new attribute</returns>
-//        public static StringSigData CreateOffsetStringSig(this FusionRoom fr, uint number, string name, eSigIoMask mask)
-//        {
-//            if (number < 50) throw new ArgumentOutOfRangeException("number", "Cannot be less than 50");
-//            number -= 49;
-//            fr.AddSig(eSigType.String, number, name, mask);
-//            return fr.UserDefinedStringSigDetails[number];
-//        }
-
-//        /// <summary>
-//        /// Creates and returns a static asset
-//        /// </summary>
-//        /// <returns>the new asset</returns>
-//        public static FusionStaticAsset CreateStaticAsset(this FusionRoom fr, uint number, string name, string type, string instanceId)
-//        {
-//            fr.AddAsset(eAssetType.StaticAsset, number, name, type, instanceId);
-//            return fr.UserConfigurableAssetDetails[number].Asset as FusionStaticAsset;
-//        }
-//    }
-
-//    //************************************************************************************************
-//    /// <summary>
-//    /// Extensions to enhance Fusion room, asset and signal creation.
-//    /// </summary>
-//    public static class FusionStaticAssetExtensions
-//    {
-//        /// <summary>
-//        /// Tries to set a Fusion asset with the make and model of a device.
-//        /// If the provided Device is IMakeModel, will set the corresponding parameters on the fusion static asset.
-//        /// Otherwise, does nothing.
-//        /// </summary>
-//        public static void TrySetMakeModel(this FusionStaticAsset asset, Device device)
-//        {
-//            var mm = device as IMakeModel;
-//            if (mm != null)
-//            {
-//                asset.ParamMake.Value = mm.DeviceMake;
-//                asset.ParamModel.Value = mm.DeviceModel;
-//            }
-//        }
-
-//        /// <summary>
-//        /// Tries to attach the AssetError input on a Fusion asset to a Device's
-//        /// CommunicationMonitor.StatusChange event. Does nothing if the device is not 
-//        /// IStatusMonitor
-//        /// </summary>
-//        /// <param name="asset"></param>
-//        /// <param name="device"></param>
-//        public static void TryLinkAssetErrorToCommunication(this FusionStaticAsset asset, Device device)
-//        {
-//            if (device is ICommunicationMonitor)
-//            {
-//                var monitor = (device as ICommunicationMonitor).CommunicationMonitor;
-//                monitor.StatusChange += (o, a) =>
-//                {
-//                    // Link connected and error inputs on asset
-//                    asset.Connected.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
-//                    asset.AssetError.InputSig.StringValue = a.Status.ToString();
-//                };
-//                // set current value
-//                asset.Connected.InputSig.BoolValue = monitor.Status == MonitorStatus.IsOk;
-//                asset.AssetError.InputSig.StringValue = monitor.Status.ToString();
-//            }
-//        }
-//    }
-
-//}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs

@@ -9,7 +9,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.CrestronIO;
 
 
-namespace PepperDash.Essentials.Devices.Common.Microphones
+namespace PepperDash.Essentials.Core.Privacy
 {
     /// <summary>
     /// Used for applications where one or more microphones with momentary contact closure outputs are used to

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyControllerConfig.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core.CrestronIO;
 
-namespace PepperDash.Essentials.Devices.Common.Microphones
+namespace PepperDash.Essentials.Core.Privacy
 {
     public class MicrophonePrivacyControllerConfig
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -123,6 +123,8 @@
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
+    <Compile Include="Devices\PC\InRoomPc.cs" />
+    <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
@@ -132,12 +134,19 @@
     <Compile Include="Feedbacks\IntFeedback.cs" />
     <Compile Include="Feedbacks\SerialFeedback.cs" />
     <Compile Include="Feedbacks\StringFeedback.cs" />
+    <Compile Include="Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" />
+    <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
+    <Compile Include="Fusion\FusionEventHandlers.cs" />
+    <Compile Include="Fusion\FusionProcessorQueries.cs" />
+    <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Global\JobTimer.cs" />
     <Compile Include="Global\Scheduler.cs" />
     <Compile Include="JoinMaps\JoinMapBase.cs" />
     <Compile Include="Lighting\Lighting Interfaces.cs" />
     <Compile Include="Lighting\LightingBase.cs" />
     <Compile Include="Monitoring\SystemMonitorController.cs" />
+    <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
+    <Compile Include="Microphone Privacy\MicrophonePrivacyControllerConfig.cs" />
     <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
@@ -173,6 +182,10 @@
     <Compile Include="Feedbacks\BoolFeedbackOneShot.cs" />
     <Compile Include="Ramps and Increments\NumericalHelpers.cs" />
     <Compile Include="Ramps and Increments\UshortSigIncrementer.cs" />
+    <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Room\EssentialsRoomBase.cs" />
+    <Compile Include="Room\Interfaces.cs" />
+    <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
     <Compile Include="Routing\ICardPortsDevice.cs" />
     <Compile Include="InUseTracking\IInUseTracking.cs" />
@@ -191,7 +204,6 @@
     <Compile Include="Display\DELETE IRDisplayBase.cs" />
     <Compile Include="Display\MockDisplay.cs" />
     <Compile Include="Ethernet\EthernetStatistics.cs" />
-    <Compile Include="Fusion\MOVED FusionSystemController.cs" />
     <Compile Include="Global\Global.cs" />
     <Compile Include="License\EssentialsLicenseManager.cs" />
     <Compile Include="Feedbacks\BoolOutputLogicals.cs" />
@@ -238,7 +250,6 @@
     <Compile Include="Feedbacks\FeedbackBase.cs" />
     <Compile Include="Room\Room.cs" />
     <Compile Include="Room\RoomCues.cs" />
-    <Compile Include="Room\MOVED RoomEventArgs.cs" />
     <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
     <Compile Include="Touchpanels\ModalDialog.cs" />
     <Compile Include="Touchpanels\SmartGraphicsTouchpanelControllerBase.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs

@@ -1,297 +1,311 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using Crestron.SimplSharp;
+using Crestron.SimplSharp;
-using Crestron.SimplSharp.Scheduler;
+using Crestron.SimplSharp.Scheduler;
-
+
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Devices.Common.Occupancy;
+
-
+namespace PepperDash.Essentials.Core
-namespace PepperDash.Essentials
+{
-{
+    /// <summary>
-    /// <summary>
+    /// 
-    /// 
+    /// </summary>
-    /// </summary>
+    public abstract class EssentialsRoomBase : ReconfigurableDevice
-    public abstract class EssentialsRoomBase : ReconfigurableDevice
+    {
-    {
+        /// <summary>
-        /// <summary>
+        ///
-        ///
+        /// </summary>
-        /// </summary>
+        public BoolFeedback OnFeedback { get; private set; }
-        public BoolFeedback OnFeedback { get; private set; }
+
-
+        /// <summary>
-        /// <summary>
+        /// Fires when the RoomOccupancy object is set
-        /// Fires when the RoomOccupancy object is set
+        /// </summary>
-        /// </summary>
+        public event EventHandler<EventArgs> RoomOccupancyIsSet;
-        public event EventHandler<EventArgs> RoomOccupancyIsSet;
+
-
+        public BoolFeedback IsWarmingUpFeedback { get; private set; }
-        public BoolFeedback IsWarmingUpFeedback { get; private set; }
+        public BoolFeedback IsCoolingDownFeedback { get; private set; }
-        public BoolFeedback IsCoolingDownFeedback { get; private set; }
+
-
+        public IOccupancyStatusProvider RoomOccupancy { get; private set; }
-        public IOccupancyStatusProvider RoomOccupancy { get; private set; }
+
-
+        public bool OccupancyStatusProviderIsRemote { get; private set; }
-        public bool OccupancyStatusProviderIsRemote { get; private set; }
+
-
+        protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
-        protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
+        protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
-        protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
+
-
+        /// <summary>
-        /// <summary>
+        /// The config name of the source list
-        /// Timer used for informing the UIs of a shutdown
+        /// </summary>
-        /// </summary>        
+        public string SourceListKey { get; set; }
-        public SecondsCountdownTimer ShutdownPromptTimer { get; private set; }
+
-
+        /// <summary>
-        /// <summary>
+        /// Timer used for informing the UIs of a shutdown
-        /// 
+        /// </summary>        
-        /// </summary>
+        public SecondsCountdownTimer ShutdownPromptTimer { get; private set; }
-        public int ShutdownPromptSeconds { get; set; }
+
-        public int ShutdownVacancySeconds { get; set; }
+        /// <summary>
-        public eShutdownType ShutdownType { get; private set; }
+        /// 
-
+        /// </summary>
-        public PepperDash.Essentials.Room.EssentialsRoomEmergencyBase Emergency { get; set; }
+        public int ShutdownPromptSeconds { get; set; }
-
+        public int ShutdownVacancySeconds { get; set; }
-        public PepperDash.Essentials.Devices.Common.Microphones.MicrophonePrivacyController MicrophonePrivacy { get; set; }
+        public eShutdownType ShutdownType { get; private set; }
-
+
-        public string LogoUrl { get; set; }
+        public EssentialsRoomEmergencyBase Emergency { get; set; }
-
+
-        protected SecondsCountdownTimer RoomVacancyShutdownTimer { get; private set; }
+        public Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; set; }
-
+
-        public eVacancyMode VacancyMode { get; private set; }
+        public string LogoUrl { get; set; }
-
+
-        /// <summary>
+        protected SecondsCountdownTimer RoomVacancyShutdownTimer { get; private set; }
-        /// Seconds after vacancy prompt is displayed until shutdown
+
-        /// </summary>
+        public eVacancyMode VacancyMode { get; private set; }
-        protected int RoomVacancyShutdownSeconds;
+
-
+        /// <summary>
-        /// <summary>
+        /// Seconds after vacancy prompt is displayed until shutdown
-        /// Seconds after vacancy detected until prompt is displayed
+        /// </summary>
-        /// </summary>
+        protected int RoomVacancyShutdownSeconds;
-        protected int RoomVacancyShutdownPromptSeconds;
+
-
+        /// <summary>
-        /// <summary>
+        /// Seconds after vacancy detected until prompt is displayed
-        /// 
+        /// </summary>
-        /// </summary>
+        protected int RoomVacancyShutdownPromptSeconds;
-        protected abstract Func<bool> OnFeedbackFunc { get; }
+
-
+        /// <summary>
-		protected Dictionary<IBasicVolumeWithFeedback, uint> SavedVolumeLevels = new Dictionary<IBasicVolumeWithFeedback, uint>();
+        /// 
-
+        /// </summary>
-		/// <summary>
+        protected abstract Func<bool> OnFeedbackFunc { get; }
-		/// When volume control devices change, should we zero the one that we are leaving?
+
-		/// </summary>
+		protected Dictionary<IBasicVolumeWithFeedback, uint> SavedVolumeLevels = new Dictionary<IBasicVolumeWithFeedback, uint>();
-		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; private set; }
+
-
+		/// <summary>
-
+		/// When volume control devices change, should we zero the one that we are leaving?
-        public EssentialsRoomBase(DeviceConfig config)
+		/// </summary>
-            : base(config)
+		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; private set; }
-        {
+
-            // Setup the ShutdownPromptTimer
+
-            ShutdownPromptTimer = new SecondsCountdownTimer(Key + "-offTimer");
+        public EssentialsRoomBase(DeviceConfig config)
-            ShutdownPromptTimer.IsRunningFeedback.OutputChange += (o, a) =>
+            : base(config)
-            {
+        {
-                if (!ShutdownPromptTimer.IsRunningFeedback.BoolValue)
+            // Setup the ShutdownPromptTimer
-                    ShutdownType = eShutdownType.None;
+            ShutdownPromptTimer = new SecondsCountdownTimer(Key + "-offTimer");
-            };
+            ShutdownPromptTimer.IsRunningFeedback.OutputChange += (o, a) =>
-            ShutdownPromptTimer.HasFinished += (o, a) => Shutdown(); // Shutdown is triggered 
+            {
-
+                if (!ShutdownPromptTimer.IsRunningFeedback.BoolValue)
-            ShutdownPromptSeconds = 60;
+                    ShutdownType = eShutdownType.None;
-            ShutdownVacancySeconds = 120;
+            };
-            ShutdownType = eShutdownType.None;
+            ShutdownPromptTimer.HasFinished += (o, a) => Shutdown(); // Shutdown is triggered 
-
+
-            RoomVacancyShutdownTimer = new SecondsCountdownTimer(Key + "-vacancyOffTimer");
+            ShutdownPromptSeconds = 60;
-            //RoomVacancyShutdownTimer.IsRunningFeedback.OutputChange += (o, a) =>
+            ShutdownVacancySeconds = 120;
-            //{
+            ShutdownType = eShutdownType.None;
-            //    if (!RoomVacancyShutdownTimer.IsRunningFeedback.BoolValue)
+
-            //        ShutdownType = ShutdownType.Vacancy;
+            RoomVacancyShutdownTimer = new SecondsCountdownTimer(Key + "-vacancyOffTimer");
-            //};
+            //RoomVacancyShutdownTimer.IsRunningFeedback.OutputChange += (o, a) =>
-            RoomVacancyShutdownTimer.HasFinished += new EventHandler<EventArgs>(RoomVacancyShutdownPromptTimer_HasFinished); // Shutdown is triggered
+            //{
-
+            //    if (!RoomVacancyShutdownTimer.IsRunningFeedback.BoolValue)
-            RoomVacancyShutdownPromptSeconds = 1500;    //  25 min to prompt warning
+            //        ShutdownType = ShutdownType.Vacancy;
-            RoomVacancyShutdownSeconds = 240;           //  4 min after prompt will trigger shutdown prompt
+            //};
-            VacancyMode = eVacancyMode.None;
+            RoomVacancyShutdownTimer.HasFinished += new EventHandler<EventArgs>(RoomVacancyShutdownPromptTimer_HasFinished); // Shutdown is triggered
-
+
-            OnFeedback = new BoolFeedback(OnFeedbackFunc);
+            RoomVacancyShutdownPromptSeconds = 1500;    //  25 min to prompt warning
-
+            RoomVacancyShutdownSeconds = 240;           //  4 min after prompt will trigger shutdown prompt
-            IsWarmingUpFeedback = new BoolFeedback(IsWarmingFeedbackFunc);
+            VacancyMode = eVacancyMode.None;
-            IsCoolingDownFeedback = new BoolFeedback(IsCoolingFeedbackFunc);
+
-
+            OnFeedback = new BoolFeedback(OnFeedbackFunc);
-            AddPostActivationAction(() =>
+
-            {
+            IsWarmingUpFeedback = new BoolFeedback(IsWarmingFeedbackFunc);
-                if (RoomOccupancy != null)
+            IsCoolingDownFeedback = new BoolFeedback(IsCoolingFeedbackFunc);
-                    OnRoomOccupancyIsSet();
+
-            });
+            AddPostActivationAction(() =>
-        }
+            {
-
+                if (RoomOccupancy != null)
-        void RoomVacancyShutdownPromptTimer_HasFinished(object sender, EventArgs e)
+                    OnRoomOccupancyIsSet();
-        {
+            });
-            switch (VacancyMode)
+        }
-            {
+
-                case eVacancyMode.None:
+        void RoomVacancyShutdownPromptTimer_HasFinished(object sender, EventArgs e)
-                    StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
+        {
-                    break;
+            switch (VacancyMode)
-                case eVacancyMode.InInitialVacancy:
+            {
-                    StartRoomVacancyTimer(eVacancyMode.InShutdownWarning);
+                case eVacancyMode.None:
-                    break;
+                    StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
-                case eVacancyMode.InShutdownWarning:
+                    break;
-                    {
+                case eVacancyMode.InInitialVacancy:
-                        StartShutdown(eShutdownType.Vacancy);
+                    StartRoomVacancyTimer(eVacancyMode.InShutdownWarning);
-                        Debug.Console(0, this, "Shutting Down due to vacancy.");
+                    break;
-                        break;
+                case eVacancyMode.InShutdownWarning:
-                    }
+                    {
-                default:
+                        StartShutdown(eShutdownType.Vacancy);
-                    break;
+                        Debug.Console(0, this, "Shutting Down due to vacancy.");
-            }
+                        break;
-        }
+                    }
-
+                default:
-        /// <summary>
+                    break;
-        /// 
+            }
-        /// </summary>
+        }
-        /// <param name="type"></param>
+
-        public void StartShutdown(eShutdownType type)
+        /// <summary>
-        {
+        /// 
-            // Check for shutdowns running. Manual should override other shutdowns
+        /// </summary>
-
+        /// <param name="type"></param>
-            if (type == eShutdownType.Manual)
+        public void StartShutdown(eShutdownType type)
-                ShutdownPromptTimer.SecondsToCount = ShutdownPromptSeconds;
+        {
-            else if (type == eShutdownType.Vacancy)
+            // Check for shutdowns running. Manual should override other shutdowns
-                ShutdownPromptTimer.SecondsToCount = ShutdownVacancySeconds;
+
-            ShutdownType = type;
+            if (type == eShutdownType.Manual)
-            ShutdownPromptTimer.Start();
+                ShutdownPromptTimer.SecondsToCount = ShutdownPromptSeconds;
-
+            else if (type == eShutdownType.Vacancy)
-            Debug.Console(0, this, "ShutdwonPromptTimer Started. Type: {0}.  Seconds: {1}", ShutdownType, ShutdownPromptTimer.SecondsToCount);
+                ShutdownPromptTimer.SecondsToCount = ShutdownVacancySeconds;
-        }
+            ShutdownType = type;
-
+            ShutdownPromptTimer.Start();
-        public void StartRoomVacancyTimer(eVacancyMode mode)
+
-        {
+            Debug.Console(0, this, "ShutdwonPromptTimer Started. Type: {0}.  Seconds: {1}", ShutdownType, ShutdownPromptTimer.SecondsToCount);
-            if (mode == eVacancyMode.None)
+        }
-                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownPromptSeconds;
+
-            else if (mode == eVacancyMode.InInitialVacancy)
+        public void StartRoomVacancyTimer(eVacancyMode mode)
-                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownSeconds;
+        {
-            VacancyMode = mode;
+            if (mode == eVacancyMode.None)
-            RoomVacancyShutdownTimer.Start();
+                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownPromptSeconds;
-
+            else if (mode == eVacancyMode.InInitialVacancy)
-            Debug.Console(0, this, "Vacancy Timer Started. Mode: {0}.  Seconds: {1}", VacancyMode, RoomVacancyShutdownTimer.SecondsToCount);
+                RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownSeconds;
-        }
+            VacancyMode = mode;
-
+            RoomVacancyShutdownTimer.Start();
-        /// <summary>
+
-        /// Resets the vacancy mode and shutsdwon the room
+            Debug.Console(0, this, "Vacancy Timer Started. Mode: {0}.  Seconds: {1}", VacancyMode, RoomVacancyShutdownTimer.SecondsToCount);
-        /// </summary>
+        }
-        public void Shutdown()
+
-        {
+        /// <summary>
-            VacancyMode = eVacancyMode.None;
+        /// Resets the vacancy mode and shutsdwon the room
-            EndShutdown();
+        /// </summary>
-        }
+        public void Shutdown()
-
+        {
-        /// <summary>
+            VacancyMode = eVacancyMode.None;
-        /// This method is for the derived class to define it's specific shutdown
+            EndShutdown();
-        /// requirements but should not be called directly.  It is called by Shutdown()
+        }
-        /// </summary>
+
-        protected abstract void EndShutdown();
+        /// <summary>
-
+        /// This method is for the derived class to define it's specific shutdown
-
+        /// requirements but should not be called directly.  It is called by Shutdown()
-        /// <summary>
+        /// </summary>
-        /// Override this to implement a default volume level(s) method
+        protected abstract void EndShutdown();
-        /// </summary>
+
-        public abstract void SetDefaultLevels();
+
-
+        /// <summary>
-        /// <summary>
+        /// Override this to implement a default volume level(s) method
-        /// Sets the object to be used as the IOccupancyStatusProvider for the room. Can be an Occupancy Aggregator or a specific device
+        /// </summary>
-        /// </summary>
+        public abstract void SetDefaultLevels();
-        /// <param name="statusProvider"></param>
+
-        public void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes)
+        /// <summary>
-        { 
+        /// Sets the object to be used as the IOccupancyStatusProvider for the room. Can be an Occupancy Aggregator or a specific device
-			if (statusProvider == null)
+        /// </summary>
-			{
+        /// <param name="statusProvider"></param>
-				Debug.Console(0, this, "ERROR: Occupancy sensor device is null");
+        public void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes)
-				return;
+        { 
-			}
+			if (statusProvider == null)
-
+			{
-            // If status provider is fusion, set flag to remote
+				Debug.Console(0, this, "ERROR: Occupancy sensor device is null");
-            if (statusProvider is PepperDash.Essentials.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase)
+				return;
-                OccupancyStatusProviderIsRemote = true;
+			}
-
+
-            if(timeoutMinutes > 0)
+            // If status provider is fusion, set flag to remote
-                RoomVacancyShutdownSeconds = timeoutMinutes * 60;
+            if (statusProvider is Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase)
-
+                OccupancyStatusProviderIsRemote = true;
-            Debug.Console(1, this, "RoomVacancyShutdownSeconds set to {0}", RoomVacancyShutdownSeconds);
+
-
+            if(timeoutMinutes > 0)
-            RoomOccupancy = statusProvider;
+                RoomVacancyShutdownSeconds = timeoutMinutes * 60;
-
+
-            OnRoomOccupancyIsSet();
+            Debug.Console(1, this, "RoomVacancyShutdownSeconds set to {0}", RoomVacancyShutdownSeconds);
-
+
-            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange -= RoomIsOccupiedFeedback_OutputChange;
+            RoomOccupancy = statusProvider;
-            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
+
-
+            OnRoomOccupancyIsSet();
-            Debug.Console(0, this, "Room Occupancy set to device: '{0}'", (statusProvider as Device).Key);
+
-        }
+            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange -= RoomIsOccupiedFeedback_OutputChange;
-
+            RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
-        void OnRoomOccupancyIsSet()
+
-        {
+            Debug.Console(0, this, "Room Occupancy set to device: '{0}'", (statusProvider as Device).Key);
-            var handler = RoomOccupancyIsSet;
+        }
-            if (handler != null)
+
-                handler(this, new EventArgs());
+        void OnRoomOccupancyIsSet()
-        }
+        {
-
+            var handler = RoomOccupancyIsSet;
-        /// <summary>
+            if (handler != null)
-        /// To allow base class to power room on to last source
+                handler(this, new EventArgs());
-        /// </summary>
+        }
-        public abstract void PowerOnToDefaultOrLastSource();
+
-
+        /// <summary>
-        /// <summary>
+        /// To allow base class to power room on to last source
-        /// To allow base class to power room on to default source
+        /// </summary>
-        /// </summary>
+        public abstract void PowerOnToDefaultOrLastSource();
-        /// <returns></returns>
+
-        public abstract bool RunDefaultPresentRoute();
+        /// <summary>
-
+        /// To allow base class to power room on to default source
-        void RoomIsOccupiedFeedback_OutputChange(object sender, EventArgs e)
+        /// </summary>
-        {
+        /// <returns></returns>
-            if (RoomOccupancy.RoomIsOccupiedFeedback.BoolValue == false)
+        public abstract bool RunDefaultPresentRoute();
-            {
+
-                Debug.Console(1, this, "Notice: Vacancy Detected");
+        void RoomIsOccupiedFeedback_OutputChange(object sender, EventArgs e)
-                // Trigger the timer when the room is vacant
+        {
-                StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
+            if (RoomOccupancy.RoomIsOccupiedFeedback.BoolValue == false)
-            }
+            {
-            else
+                Debug.Console(1, this, "Notice: Vacancy Detected");
-            {
+                // Trigger the timer when the room is vacant
-                Debug.Console(1, this, "Notice: Occupancy Detected");
+                StartRoomVacancyTimer(eVacancyMode.InInitialVacancy);
-                // Reset the timer when the room is occupied
+            }
-                RoomVacancyShutdownTimer.Cancel();
+            else
-            }
+            {
-        }
+                Debug.Console(1, this, "Notice: Occupancy Detected");
-
+                // Reset the timer when the room is occupied
-        /// <summary>
+                RoomVacancyShutdownTimer.Cancel();
-        /// Executes when RoomVacancyShutdownTimer expires.  Used to trigger specific room actions as needed.  Must nullify the timer object when executed
+            }
-        /// </summary>
+        }
-        /// <param name="o"></param>
+
-        public abstract void RoomVacatedForTimeoutPeriod(object o);
+        /// <summary>
-    }
+        /// Executes when RoomVacancyShutdownTimer expires.  Used to trigger specific room actions as needed.  Must nullify the timer object when executed
-        
+        /// </summary>
-    /// <summary>
+        /// <param name="o"></param>
-    /// To describe the various ways a room may be shutting down
+        public abstract void RoomVacatedForTimeoutPeriod(object o);
-    /// </summary>
+    }
-    public enum eShutdownType
+        
-    {
+    /// <summary>
-        None = 0,
+    /// To describe the various ways a room may be shutting down
-        External,
+    /// </summary>
-        Manual,
+    public enum eShutdownType
-        Vacancy
+    {
-    }
+        None = 0,
-
+        External,
-    public enum eVacancyMode
+        Manual,
-    {
+        Vacancy
-        None = 0,
+    }
-        InInitialVacancy,
+
-        InShutdownWarning
+    public enum eVacancyMode
-    }
+    {
-
+        None = 0,
-    /// <summary>
+        InInitialVacancy,
-    /// 
+        InShutdownWarning
-    /// </summary>
+    }
-    public enum eWarmingCoolingMode
+
-    {
+    /// <summary>
-        None,
+    /// 
-        Warming,
+    /// </summary>
-        Cooling
+    public enum eWarmingCoolingMode
-    }
+    {
+        None,
+        Warming,
+        Cooling
+    }
+
+    public abstract class EssentialsRoomEmergencyBase : IKeyed
+    {
+        public string Key { get; private set; }
+
+        public EssentialsRoomEmergencyBase(string key)
+        {
+            Key = key;
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Interfaces.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+
+    /// <summary>
+    /// For rooms with routing
+    /// </summary>
+    public interface IRunRouteAction
+    {
+        void RunRouteAction(string routeKey);
+
+        void RunRouteAction(string routeKey, Action successCallback);
+    }
+
+    /// <summary>
+    /// For rooms that default presentation only routing
+    /// </summary>
+    public interface IRunDefaultPresentRoute
+    {
+        bool RunDefaultPresentRoute();
+    }
+
+    /// <summary>
+    /// For rooms that have default presentation and calling routes
+    /// </summary>
+    public interface IRunDefaultCallRoute : IRunDefaultPresentRoute
+    {
+        bool RunDefaultCallRoute();
+    }
+    
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/MOVED RoomEventArgs.cs

@@ -1,41 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-
-//namespace PepperDash.Essentials.Core
-//{
-//    public class EssentialsRoomSourceChangeEventArgs : EventArgs
-//    {
-//        public EssentialsRoom Room { get; private set; }
-//        public IPresentationSource OldSource { get; private set; }
-//        public IPresentationSource NewSource { get; private set; }
-
-//        public EssentialsRoomSourceChangeEventArgs(EssentialsRoom room, 
-//            IPresentationSource oldSource, IPresentationSource newSource)
-//        {
-//            Room = room;
-//            OldSource = oldSource;
-//            NewSource = newSource;
-//        }
-//    }
-
-
-
-//    public class EssentialsRoomAudioDeviceChangeEventArgs : EventArgs
-//    {
-//        public EssentialsRoom Room { get; private set; }
-//        public IBasicVolumeControls OldDevice { get; private set; }
-//        public IBasicVolumeControls NewDevice { get; private set; }
-
-//        public EssentialsRoomAudioDeviceChangeEventArgs(EssentialsRoom room,
-//            IBasicVolumeControls oldDevice, IBasicVolumeControls newDevice)
-//        {
-//            Room = room;
-//            OldDevice = oldDevice;
-//            NewDevice = newDevice;
-//        }
-//    }
-
-//}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/iOccupancyStatusProvider.cs

@@ -6,7 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Devices.Common.Occupancy
+namespace PepperDash.Essentials.Core
 {
     public interface IOccupancyStatusProvider
     {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs

@@ -11,9 +11,26 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
+
+    /// <summary>
+    /// The handler type for a Room's SourceInfoChange
+    /// </summary>
+    public delegate void SourceInfoChangeHandler(EssentialsRoomBase room, SourceListItem info, ChangeType type);
+
+
 	//*******************************************************************************************
 	// Interfaces
 
+    /// <summary>
+    /// For rooms with a single presentation source, change event
+    /// </summary>
+    public interface IHasCurrentSourceInfoChange
+    {
+        string CurrentSourceInfoKey { get; }
+        SourceListItem CurrentSourceInfo { get; }
+        event SourceInfoChangeHandler CurrentSourceChange;
+    }
+
 
 	/// <summary>
 	/// Defines a class that has a collection of RoutingInputPorts
@@ -43,7 +60,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// Endpoint device like a display, that selects inputs
 	/// </summary>
-	public interface IRoutingSinkWithSwitching : IRoutingSinkNoSwitching
+	public interface IRoutingSinkWithSwitching : IRoutingSinkNoSwitching, IHasCurrentSourceInfoChange
 	{
 		//void ClearRoute();
 		void ExecuteSwitch(object inputSelector);

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -150,13 +150,8 @@
     <Compile Include="Environment\Somfy\RelayControlledShade.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Generic\GenericSource.cs" />
-    <Compile Include="Microphone\MicrophonePrivacyController.cs" />
-    <Compile Include="Microphone\MicrophonePrivacyControllerConfig.cs" />
     <Compile Include="Occupancy\GlsOccupancySensorBaseController.cs" />
     <Compile Include="Occupancy\IOccupancyStatusProviderAggregator.cs" />
-    <Compile Include="Occupancy\iOccupancyStatusProvider.cs" />
-    <Compile Include="PC\InRoomPc.cs" />
-    <Compile Include="PC\Laptop.cs" />
     <Compile Include="SetTopBox\SetTopBoxPropertiesConfig.cs" />
     <Compile Include="Streaming\AppleTV.cs" />
     <Compile Include="Audio\GenericAudioOut.cs" />