Merge 6946946c12 into dca73e1508

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,9 +7,6 @@ assignees: ''
 
 ---
 
-**Was this bug identified in a specific build version?**
-Please note the build version where this bug was identified
-
 **Describe the bug**
 A clear and concise description of what the bug is.  
 

PepperDashEssentials/ControlSystem.cs

@@ -450,13 +450,14 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            uint fusionIpId = 0xf1;
-
             foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
             {
                 var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as IEssentialsRoom;
                 if (room != null)
                 {
+                    // default IPID
+                    uint fusionIpId = 0xf1;
+
                     // default to no join map key
                     string fusionJoinMapKey = string.Empty;
 
@@ -477,36 +478,36 @@ namespace PepperDash.Essentials
                     {
                         DeviceManager.AddDevice(room);
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, fusionIpId, fusionJoinMapKey));
 
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is IEssentialsHuddleVtc1Room)
                     {
                         DeviceManager.AddDevice(room);
 
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else if (room is EssentialsTechRoom)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                            "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion with IP-ID {0:X2}", fusionIpId);
+                            "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion");
                         DeviceManager.AddDevice(new EssentialsTechRoomFusionSystemController((EssentialsTechRoom)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
 
-                        CreateMobileControlBridge(room as EssentialsRoomBase);
+                        CreateMobileControlBridge(room);
                     }
                     else
                     {
@@ -514,20 +515,16 @@ namespace PepperDash.Essentials
                         DeviceManager.AddDevice(room);
                     }
 
-                    fusionIpId += 1;
                 }
                 else
-                {
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Cannot create room from config, key '{0}' - Is this intentional?  This may be a valid configuration.", roomConfig.Key);
-                    
-                }
             }
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "All Rooms Loaded.");
 
         }
 
-        private static void CreateMobileControlBridge(EssentialsRoomBase room)
+        private static void CreateMobileControlBridge(IEssentialsRoom room)
         {
             var mobileControl = GetMobileControlDevice();
 

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -150,7 +150,7 @@ namespace PepperDash.Essentials.Fusion
 
         protected override void CreateSymbolAndBasicSigs(uint ipId)
         {
-            Debug.Console(0, this, "Creating Fusion Room symbol with GUID: {0} and IP-ID {1:X2}", RoomGuid, ipId);
+            Debug.Console(1, this, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
 
             FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
             FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();

PepperDashEssentials/PepperDashEssentials.csproj

@@ -149,8 +149,7 @@
     <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
     <Compile Include="Room\Types\EssentialsTechRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleSpaceRoom.cs" />
-    <Compile Include="Room\Types\Interfaces\IEssentialsHuddleVtc1Room.cs" />
+    <Compile Include="Room\Types\IEssentialsHuddleSpaceRoom.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsEnvironmentDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsLightingDriver.cs" />
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -454,8 +454,7 @@ namespace PepperDash.Essentials
             else
             {
                 Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, new Action(() => { }));
+                throw new NotImplementedException();
             }
         }
 
@@ -472,11 +471,7 @@ namespace PepperDash.Essentials
                 RunRouteAction(routeKey, successCallback);
             }
             else
-            {
-                Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, successCallback);
-            }
+                throw new NotImplementedException();
         }
 
 		/// <summary>

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.AudioCodec;
+
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials
+{
+    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay
+    {
+        bool ExcludeFromGlobalFunctions { get; }
+
+        void RunRouteAction(string routeKey);
+
+        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
+
+        IBasicVolumeControls CurrentVolumeControls { get; }
+
+        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+    }
+
+    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
+        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
+    {
+        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
+
+        void RunRouteAction(string routeKey);
+
+        IHasScheduleAwareness ScheduleSource { get; }
+
+        BoolFeedback InCallFeedback { get; }
+
+        BoolFeedback PrivacyModeIsOnFeedback { get; }
+
+        string DefaultCodecRouteString { get; }
+    }
+}

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs

@@ -1,24 +0,0 @@
-using System;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Room.Config;
-
-
-
-namespace PepperDash.Essentials
-{
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-
-        IBasicVolumeControls CurrentVolumeControls { get; }
-
-        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-    }
-
- 
-}

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs

@@ -1,25 +0,0 @@
-
-using PepperDash.Essentials.Core;
-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
-{
-    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
-    {
-        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
-
-        void RunRouteAction(string routeKey);
-
-        IHasScheduleAwareness ScheduleSource { get; }
-
-        new BoolFeedback InCallFeedback { get; }
-
-        new BoolFeedback PrivacyModeIsOnFeedback { get; }
-
-        string DefaultCodecRouteString { get; }
-    }
-}

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -79,16 +79,6 @@ namespace PepperDash.Essentials
                     Panel = new Tsw1052(id, Global.ControlSystem);
                 else if (type == "tsw1060")
                     Panel = new Tsw1060(id, Global.ControlSystem);
-                else if (type == "tsw570")
-                    Panel = new Tsw570(id, Global.ControlSystem);
-                else if (type == "tsw770")
-                    Panel = new Tsw770(id, Global.ControlSystem);
-                else if (type == "ts770")
-                    Panel = new Ts770(id, Global.ControlSystem);
-                else if (type == "tsw1070")
-                    Panel = new Tsw1070(id, Global.ControlSystem);
-                else if (type == "ts1070")
-                    Panel = new Ts1070(id, Global.ControlSystem);
                 else
                 {
                     Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "WARNING: Cannot create TSW controller with type '{0}'", type);
@@ -213,7 +203,7 @@ namespace PepperDash.Essentials
     {
         public EssentialsTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "tsw570", "tsw770", "ts770", "tsw1070", "ts1070", "xpanel" };
+            TypeNames = new List<string>() { "tsw550", "tsw750", "tsw1050", "tsw560", "tsw760", "tsw1060", "xpanel" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -103,7 +103,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 1202
         /// </summary>
-        public const uint VCStagingInactivePopoverWithRecentsVisible = 1202;
+        public const uint VCStagingInactivePopoverVisible = 1202;
         /// <summary>
         /// 
         /// </summary>
@@ -121,11 +121,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCRecentsVisible = 1206;
 
-        /// <summary>
-        /// 1202
-        /// </summary>
-        public const uint VCStagingInactivePopoverWithoutRecentsVisible = 1207;
-
 		/// <summary>
 		/// 1208
 		/// </summary>
@@ -248,10 +243,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint VCCameraSelectBarWithoutModeVisible = 1261;
 
-        /// <summary>
-        /// 1262
-        /// </summary>
-        public const uint VCCameraAutoModeIsOnFb = 1262;
 
         /// <summary>
         /// 1271

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -207,7 +207,6 @@ namespace PepperDash.Essentials
             //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
 
             // Set the call status text
-            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
             if (codec.ActiveCalls.Count > 0)
             {
                 if (codec.ActiveCalls.Count == 1)

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddleTechPageDriver.cs

@@ -8,7 +8,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 
 using PepperDash.Core;
 using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
@@ -316,7 +316,7 @@ namespace PepperDash.Essentials.UIDrivers
         void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
         {
             var c = sender as ICommunicationMonitor;
-            if (c != null && StatusListDeviceIndexes.ContainsKey(c))
+            if (StatusListDeviceIndexes.ContainsKey(c))
             {
                 var i = StatusListDeviceIndexes[c];
                 StatusList.UShortInputSig(i, 1).UShortValue = (ushort)e.Status;

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -1035,7 +1035,7 @@ namespace PepperDash.Essentials
 				if (CurrentRoom.CurrentSourceInfo != null &&  CurrentRoom.CurrentSourceInfo.DisableCodecSharing)
 				{
 					Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source");
-					CurrentRoom.RunRouteAction("codecOsd");
+					CurrentRoom.RunRouteAction("codecOsd", CurrentRoom.SourceListKey);
 				}
 			}
 

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -142,10 +142,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
 
                 StagingBarsInterlock = new JoinedSigInterlock(triList);
-                if(Codec is IHasCallHistory)
-                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible);
-                else
-                    StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible);
+                StagingBarsInterlock.SetButDontShow(UIBoolJoin.VCStagingInactivePopoverVisible);
 
                 StagingButtonsFeedbackInterlock = new JoinedSigInterlock(triList);
                 StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
@@ -354,15 +351,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.UShortInput[UIUshortJoin.VCStagingConnectButtonMode].UShortValue = (ushort)(Codec.IsInCall ? 1 : 0);
 			
 			uint stageJoin;
-            if (Codec.IsInCall)
-                stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
-            else
-            {
-                if (Codec is IHasCallHistory)
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible;
-                else
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible;
-            }
+			if (Codec.IsInCall)
+				stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
+			else
+				stageJoin = UIBoolJoin.VCStagingInactivePopoverVisible;
 			if (IsVisible)
 				StagingBarsInterlock.ShowInterlocked(stageJoin);
 			else
@@ -521,18 +513,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 var codecOffCameras = Codec as IHasCameraOff;
 
-                var supportsCameraOffMode = Codec.SupportsCameraOff;
-
                 var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-                var supportsAutoCameraMode = Codec.SupportsCameraAutoMode;
-
-                if (codecAutoCameras != null && supportsAutoCameraMode)
+                if (codecAutoCameras != null)
                 {
                     CameraModeList.SetItemButtonAction(1,(b) => codecAutoCameras.CameraAutoModeOn());
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 1 Visible"].BoolValue = true;
                     codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 1 Selected"]);
-                    codecAutoCameras.CameraAutoModeIsOnFeedback.LinkInputSig(TriList.BooleanInput[UIBoolJoin.VCCameraAutoModeIsOnFb]);
                     //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 1 Pressed"].SetSigFalseAction(
                     //() => codecAutoCameras.CameraAutoModeOn());
 
@@ -567,7 +554,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 //TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanOutput["Item 2 Pressed"].SetSigFalseAction(
                 //    () => ShowCameraManualMode());
 
-                if (codecOffCameras != null && supportsCameraOffMode)
+                if (codecOffCameras != null)
                 {
                     TriList.SmartObjects[UISmartObjectJoin.VCCameraMode].BooleanInput["Item 3 Visible"].BoolValue = true;
                     codecOffCameras.CameraIsOffFeedback.LinkInputSig(CameraModeList.SmartObject.BooleanInput["Item 3 Selected"]);
@@ -782,14 +769,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
             if (camerasCodec != null && camerasCodec.SelectedCamera != null)
             {
-                Debug.Console(2, "Attempting to map camera actions to selected camera: '{0}'", camerasCodec.SelectedCamera.Key);
+
                 var dpad = CameraPtzPad;
 
                 var camera = camerasCodec.SelectedCamera as IHasCameraPtzControl;
                 if (camera != null)
                 {
-
-                    Debug.Console(2, "Selected camera is IHasCameraPtzControl");
                     if (camerasCodec.SelectedCamera.CanTilt)
                     {
                         dpad.SigUp.SetBoolSigAction((b) =>
@@ -854,46 +839,25 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     }
 
                 }
-                else
-                {
-                    Debug.Console(2, "Selected Camera is not IHasCameraPtzControl.  No controls to map");
-                }
-            }
-            else
-            {
-                Debug.Console(2, "Codec does not have cameras of selected camera is null");
             }
         }
 
         // Determines if codec is in manual camera control mode and shows feedback
         void ShowCameraManualMode()
         {
-            Debug.Console(2, "ShowCameraManualMode");
-
             var inManualMode = true;
 
             var codecOffCameras = Codec as IHasCameraOff;
 
             var codecAutoCameras = Codec as IHasCameraAutoMode;
 
-            var supportsAutoCameras = codecAutoCameras != null && Codec.SupportsCameraAutoMode;
-
             if (codecOffCameras != null && codecOffCameras.CameraIsOffFeedback.BoolValue)
             {
                 inManualMode = false;
-
-                var codecCameraMute = Codec as IHasCameraMute;
-
-                if (codecCameraMute != null)
-                {
-                    codecCameraMute.CameraMuteOff();
-                    inManualMode = true;
-
-                }
             }
 
             // Clear auto mode
-            if (supportsAutoCameras)
+            if (codecAutoCameras != null )
             {
                 if (codecAutoCameras.CameraAutoModeIsOnFeedback.BoolValue)
                 {
@@ -1237,7 +1201,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 			var lc = Codec as IHasCodecLayouts;
 			if (lc != null)
 			{
-
+                TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 				lc.LocalLayoutFeedback.LinkInputSig(TriList.StringInput[UIStringJoin.VCLayoutModeText]);
 				lc.LocalLayoutFeedback.OutputChange += (o,a) => 
 				{
@@ -1250,24 +1214,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
 				var cisco = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoSparkCodec;
 				if (cisco != null)
 				{
-                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggleSingleProminent);
 					// Cisco has min/max buttons that need special sauce
 					cisco.SharingContentIsOnFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 					//cisco.PresentationViewMaximizedFeedback.OutputChange += CiscoSharingAndPresentation_OutputChanges;
 
 					TriList.SetSigFalseAction(UIBoolJoin.VCMinMaxPress, cisco.MinMaxLayoutToggle);
 				}
-
-                var zoomRoom = Codec as PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom.ZoomRoom;
-                if (zoomRoom != null)
-                {
-                    TriList.BooleanInput[UIBoolJoin.VCLayoutToggleEnable].BoolValue = true;
-                    TriList.SetSigFalseAction(UIBoolJoin.VCLayoutTogglePress, lc.LocalLayoutToggle);
-                }
 				 
 			}
-
-            
 		}
 
 		/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -8,7 +8,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
     }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -60,7 +60,6 @@ namespace PepperDash.Essentials.Core
 		        DeviceCriticalSection.Enter();
                 AddDeviceEnabled = false;
 		        // PreActivate all devices
-                Debug.Console(0,"****PreActivation starting...****");
 		        foreach (var d in Devices.Values)
 		        {
 		            try
@@ -70,12 +69,9 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-                        Debug.Console(0, d, "ERROR: Device {1} PreActivation failure: {0}", e.Message, d.Key);
-                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
 		            }
 		        }
-                Debug.Console(0, "****PreActivation complete****");
-		        Debug.Console(0, "****Activation starting...****");
 
 		        // Activate all devices
 		        foreach (var d in Devices.Values)
@@ -87,14 +83,10 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-                        Debug.Console(0, d, "ERROR: Device {1} Activation failure: {0}", e.Message, d.Key);
-                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
 		            }
 		        }
 
-                Debug.Console(0, "****Activation complete****");
-                Debug.Console(0, "****PostActivation starting...****");
-
 		        // PostActivate all devices
 		        foreach (var d in Devices.Values)
 		        {
@@ -105,13 +97,10 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-		                Debug.Console(0, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
-		                Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
+		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
 		            }
 		        }
 
-                Debug.Console(0, "****PostActivation complete****");
-
                 OnAllDevicesActivated();
 		    }
 		    finally

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs

@@ -19,34 +19,13 @@ namespace PepperDash.Essentials.Core
         protected EssentialsDevice(string key)
             : base(key)
         {
-            SubscribeToActivateComplete();
+
         }
 
         protected EssentialsDevice(string key, string name)
             : base(key, name)
         {
-            SubscribeToActivateComplete();
-        }
 
-        private void SubscribeToActivateComplete()
-        {
-            DeviceManager.AllDevicesActivated += DeviceManagerOnAllDevicesActivated;
-        }
-
-        private void DeviceManagerOnAllDevicesActivated(object sender, EventArgs eventArgs)
-        {
-            CrestronInvoke.BeginInvoke((o) =>
-            {
-                try
-                {
-                    Initialize();
-                }
-                catch (Exception ex)
-                {
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Exception initializing device: {0}", ex.Message);
-                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stack Trace: {0}", ex.StackTrace);
-                }
-            });
         }
     }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs

@@ -1,90 +1,90 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Core;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.Touchpanels;
-
-namespace PepperDash.Essentials.Core
-{
-    public class DeviceFactoryWrapper
-    {
-        public CType CType { get; set; }
-        public string Description { get; set; }
-        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
-
-        public DeviceFactoryWrapper()
-        {
-            CType = null;
-            Description = "Not Available";
-        }
-    }
-
-    public class DeviceFactory
-    {
-        public DeviceFactory()
-        {
-            var assy = Assembly.GetExecutingAssembly();
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
-            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-
-            if (types != null)
-            {
-                foreach (var type in types)
-                {
-                    try
-                    {
-                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                        factory.LoadTypeFactories();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
-                    }
-                }
-            }
-        }
-
-		/// <summary>
-		/// A dictionary of factory methods, keyed by config types, added by plugins.
-		/// These methods are looked up and called by GetDevice in this class.
-		/// </summary>
-		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
-            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Adds a plugin factory method
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
-		{
-			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
-		}
-
-        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
-        {
-            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-
-            if(FactoryMethods.ContainsKey(typeName))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
-                return;
-            }
-
-            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
-            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp.Reflection;
+using PepperDash.Core;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Touchpanels;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DeviceFactoryWrapper
+    {
+        public CType CType { get; set; }
+        public string Description { get; set; }
+        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
+
+        public DeviceFactoryWrapper()
+        {
+            CType = null;
+            Description = "Not Available";
+        }
+    }
+
+    public class DeviceFactory
+    {
+        public DeviceFactory()
+        {
+            var assy = Assembly.GetExecutingAssembly();
+            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
+
+            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
+
+            if (types != null)
+            {
+                foreach (var type in types)
+                {
+                    try
+                    {
+                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                        factory.LoadTypeFactories();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
+                    }
+                }
+            }
+        }
+
+		/// <summary>
+		/// A dictionary of factory methods, keyed by config types, added by plugins.
+		/// These methods are looked up and called by GetDevice in this class.
+		/// </summary>
+		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
+            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
+
+		/// <summary>
+		/// Adds a plugin factory method
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <returns></returns>
+		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
+		{
+			Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
+		}
+
+        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
+        {
+            Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+
+            if(FactoryMethods.ContainsKey(typeName))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
+                return;
+            }
+
+            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
+            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
         }
 
         private static void CheckForSecrets(IEnumerable<JProperty> obj)
@@ -156,53 +156,44 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
 
                 Debug.Console(2, "{0}", ex.StackTrace);
-
-                if (ex.InnerException == null)
-                {
-                    return null;
-                }
-
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Inner exception while creating device {0}: {1}", dc.Key,
-                    ex.InnerException.Message);
-                Debug.Console(2, "{0}", ex.InnerException.StackTrace);
                 return null;
             }
         }
 
-        /// <summary>
-        /// Prints the type names and associated metadata from the FactoryMethods collection.
-        /// </summary>
-        /// <param name="command"></param>
-        public static void GetDeviceFactoryTypes(string filter)
-        {
-            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
-
-            if (!string.IsNullOrEmpty(filter))
-            {
-                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
-            }
-            else
-            {
-                types = FactoryMethods;
-            }
-
-            Debug.Console(0, "Device Types:");
-
-            foreach (var type in types.OrderBy(t => t.Key))
-            {
-                var description = type.Value.Description;
-                var cType = "Not Specified by Plugin";
-
-                if(type.Value.CType != null)
-                {
-                    cType = type.Value.CType.FullName;
-                }
-
-                Debug.Console(0, 
-                    @"Type: '{0}' 
-                    CType: '{1}' 
-                    Description: {2}", type.Key, cType, description);
-            }
-        }
-    }
+        /// <summary>
+        /// Prints the type names and associated metadata from the FactoryMethods collection.
+        /// </summary>
+        /// <param name="command"></param>
+        public static void GetDeviceFactoryTypes(string filter)
+        {
+            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+
+            if (!string.IsNullOrEmpty(filter))
+            {
+                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
+            }
+            else
+            {
+                types = FactoryMethods;
+            }
+
+            Debug.Console(0, "Device Types:");
+
+            foreach (var type in types.OrderBy(t => t.Key))
+            {
+                var description = type.Value.Description;
+                var cType = "Not Specified by Plugin";
+
+                if(type.Value.CType != null)
+                {
+                    cType = type.Value.CType.FullName;
+                }
+
+                Debug.Console(0, 
+                    @"Type: '{0}' 
+                    CType: '{1}' 
+                    Description: {2}", type.Key, cType, description);
+            }
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolFeedback.cs

@@ -62,11 +62,6 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-        public void SetValueFunc(Func<bool> newFunc)
-        {
-            ValueFunc = newFunc;
-        }
-
         public override void FireUpdate()
         {
             bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolOutputLogicals.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Core
 
 		protected bool ComputedValue;
 
-	    protected BoolFeedbackLogic()
+		public BoolFeedbackLogic()
 		{
 			Output = new BoolFeedback(() => ComputedValue);
 		}	
@@ -40,18 +40,21 @@ namespace PepperDash.Essentials.Core
 
 		public void AddOutputsIn(List<BoolFeedback> outputs)
 		{
-		    foreach (var o in outputs.Where(o => !OutputsIn.Contains(o)))
-		    {
-		        OutputsIn.Add(o);
-		        o.OutputChange += AnyInput_OutputChange;
-		    }
-		    Evaluate();
+			foreach (var o in outputs)
+			{
+				// skip existing
+				if (OutputsIn.Contains(o)) continue;
+			
+				OutputsIn.Add(o);
+				o.OutputChange += AnyInput_OutputChange;
+			}
+			Evaluate();
 		}
 
-	    public void RemoveOutputIn(BoolFeedback output)
+		public void RemoveOutputIn(BoolFeedback output)
 		{
 			// Don't double up outputs
-			if (!OutputsIn.Contains(output)) return;
+			if (OutputsIn.Contains(output)) return;
 
 			OutputsIn.Remove(output);
 			output.OutputChange -= AnyInput_OutputChange;
@@ -68,12 +71,6 @@ namespace PepperDash.Essentials.Core
 			Evaluate();
 		}
 
-	    public void ClearOutputs()
-	    {
-	        OutputsIn.Clear();
-            Evaluate();
-	    }
-
 		void AnyInput_OutputChange(object sender, EventArgs e)
 		{
 			Evaluate();
@@ -88,12 +85,11 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.All(o => o.BoolValue);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		}
 	}
 
@@ -103,35 +99,33 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.Any(o => o.BoolValue);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		}
 	}
 
 	public class BoolFeedbackLinq : BoolFeedbackLogic
 	{
-	    readonly Func<IEnumerable<BoolFeedback>, bool> _predicate;
+		Func<IEnumerable<BoolFeedback>, bool> Predicate;
 
 		public BoolFeedbackLinq(Func<IEnumerable<BoolFeedback>, bool> predicate)
 			: base()
 		{
-			_predicate = predicate;
+			Predicate = predicate;
 		}
 
 		protected override void Evaluate()
 		{
 			var prevValue = ComputedValue;
-			var newValue = _predicate(OutputsIn);
-		    if (newValue == prevValue)
-		    {
-		        return;
-		    }
-		    ComputedValue = newValue;
-		    Output.FireUpdate();
+			var newValue = Predicate(OutputsIn);
+			if (newValue != prevValue)
+			{
+				ComputedValue = newValue;
+				Output.FireUpdate();
+			}
 		} 
 	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntFeedback.cs

@@ -51,12 +51,6 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-        public void SetValueFunc(Func<int> newFunc)
-        {
-            ValueFunc = newFunc;
-        }
-
-
         public override void FireUpdate()
         {
             var newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringFeedback.cs

@@ -52,10 +52,7 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-        public void SetValueFunc(Func<string> newFunc)
-        {
-            ValueFunc = newFunc;
-        }
+
 
         public override void FireUpdate()
         {

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

@@ -119,21 +119,9 @@ namespace PepperDash.Essentials.Core.Fusion
                 var slot = Global.ControlSystem.ProgramNumber;
 
                 var guidFilePath = Global.FilePathPrefix +
-                                   string.Format(@"{0}-FusionGuids-{1:X2}.json", InitialParametersClass.ProgramIDTag, _ipId);
+                                   string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
 
-                var oldGuidFilePath = Global.FilePathPrefix +
-                                      string.Format(@"{0}-FusionGuids.json", InitialParametersClass.ProgramIDTag);
-
-                if (File.Exists(oldGuidFilePath))
-                {
-                    Debug.Console(0, this, "Migrating from old Fusion GUID file to new Fusion GUID File");
-
-                    File.Copy(oldGuidFilePath, guidFilePath);
-
-                    File.Delete(oldGuidFilePath);
-                }
-
-                _guidFileExists = File.Exists(guidFilePath); 
+                _guidFileExists = File.Exists(guidFilePath);
 
                 // Check if file exists
                 if (!_guidFileExists)
@@ -161,7 +149,19 @@ namespace PepperDash.Essentials.Core.Fusion
                 }
 
 
-                AddPostActivationAction(() => PostActivate(guidFilePath));
+                AddPostActivationAction(() =>
+                {
+                    CreateSymbolAndBasicSigs(_ipId);
+                    SetUpSources();
+                    SetUpCommunitcationMonitors();
+                    SetUpDisplay();
+                    SetUpError();
+                    ExecuteCustomSteps();
+
+                    FusionRVI.GenerateFileForAllFusionDevices();
+
+                    GenerateGuidFile(guidFilePath);
+                });
             }
             catch (Exception e)
             {
@@ -169,20 +169,6 @@ namespace PepperDash.Essentials.Core.Fusion
             }
         }
 
-        private void PostActivate(string guidFilePath)
-        {
-            CreateSymbolAndBasicSigs(_ipId);
-            SetUpSources();
-            SetUpCommunitcationMonitors();
-            SetUpDisplay();
-            SetUpError();
-            ExecuteCustomSteps();
-
-            FusionRVI.GenerateFileForAllFusionDevices();
-
-            GenerateGuidFile(guidFilePath);
-        }
-
         protected string RoomGuid
         {
             get { return _guiDs.RoomGuid; }
@@ -328,7 +314,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         protected virtual void CreateSymbolAndBasicSigs(uint ipId)
         {
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0} and IP-ID {1:X2}", RoomGuid, ipId);
+            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Creating Fusion Room symbol with GUID: {0}", RoomGuid);
 
             FusionRoom = new FusionRoom(ipId, Global.ControlSystem, Room.Name, RoomGuid);
             FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.Use();

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

@@ -88,6 +88,11 @@ namespace PepperDash.Essentials.Core.Privacy
             else
                 Debug.Console(0, this, "Unable to add Red LED device");
 
+            DeviceManager.AllDevicesActivated += (o, a) =>
+                {
+                    CheckPrivacyMode();
+                };
+
             AddPostActivationAction(() => {
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
@@ -98,15 +103,6 @@ namespace PepperDash.Essentials.Core.Privacy
             return base.CustomActivate();
         }
 
-        #region Overrides of Device
-
-        public override void Initialize()
-        {
-            CheckPrivacyMode();
-        }
-
-        #endregion
-
         public void SetPrivacyDevice(IPrivacy privacyDevice)
         {
             PrivacyDevice = privacyDevice;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/IOccupancyStatusProviderAggregator.cs

@@ -2,18 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp;
+
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Aggregates the RoomIsOccupied feedbacks of one or more IOccupancyStatusProvider objects
     /// </summary>
-    public class IOccupancyStatusProviderAggregator : EssentialsDevice, IOccupancyStatusProvider
+    public class IOccupancyStatusProviderAggregator : Device, IOccupancyStatusProvider
     {
         /// <summary>
         /// Aggregated feedback of all linked IOccupancyStatusProvider devices
@@ -22,51 +21,16 @@ namespace PepperDash.Essentials.Core
         {
             get
             {
-                return _aggregatedOccupancyStatus.Output;
+                return AggregatedOccupancyStatus.Output;
             }
         }
 
-        private readonly BoolFeedbackOr _aggregatedOccupancyStatus;
+        private BoolFeedbackOr AggregatedOccupancyStatus;
 
         public IOccupancyStatusProviderAggregator(string key, string name) 
             : base(key, name)
         {
-            _aggregatedOccupancyStatus = new BoolFeedbackOr();
-        }
-
-        public IOccupancyStatusProviderAggregator(string key, string name, OccupancyAggregatorConfig config)
-            : this(key, name)
-        {
-            AddPostActivationAction(() =>
-            {
-                if (config.DeviceKeys.Count == 0)
-                {
-                    return;
-                }
-
-                foreach (var deviceKey in config.DeviceKeys)
-                {
-                    var device = DeviceManager.GetDeviceForKey(deviceKey);
-
-                    if (device == null)
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "Unable to retrieve Occupancy provider with key {0}", deviceKey);
-                        continue;
-                    }
-
-                    var provider = device as IOccupancyStatusProvider;
-
-                    if (provider == null)
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "Device with key {0} does NOT implement IOccupancyStatusProvider. Please check configuration.");
-                        continue;
-                    }
-
-                    AddOccupancyStatusProvider(provider);
-                }
-            });
+            AggregatedOccupancyStatus = new BoolFeedbackOr();
         }
 
         /// <summary>
@@ -75,35 +39,7 @@ namespace PepperDash.Essentials.Core
         /// <param name="statusProvider"></param>
         public void AddOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
         {
-            _aggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
-        }
-
-        public void RemoveOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
-        {
-            _aggregatedOccupancyStatus.RemoveOutputIn(statusProvider.RoomIsOccupiedFeedback);
-        }
-
-        public void ClearOccupancyStatusProviders()
-        {
-            _aggregatedOccupancyStatus.ClearOutputs();
+            AggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
         }
-    }
-
-    public class OccupancyAggregatorFactory : EssentialsDeviceFactory<IOccupancyStatusProviderAggregator>
-    {
-        public OccupancyAggregatorFactory()
-        {
-            TypeNames = new List<string> { "occupancyAggregator", "occAggregate" };
-        }
-
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
-
-            var config = dc.Properties.ToObject<OccupancyAggregatorConfig>();
-                
-            return new IOccupancyStatusProviderAggregator(dc.Key, dc.Name, config);
-        }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Occupancy/OccupancyAggregatorConfig.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    public class OccupancyAggregatorConfig
-    {
-        [JsonProperty("deviceKeys")] public List<string> DeviceKeys { get; set; }
-
-        public OccupancyAggregatorConfig()
-        {
-            DeviceKeys = new List<string>();
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/EssentialsPartitionController.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Represents an abstract controller device for a partition dividing rooms that are combinable
-    /// 
-    /// In Auto mode, it can use a partition sensor to automatically determine whether the partition is present.
-    /// 
-    /// In Manual mode it accepts user input to tell it whether the partition is present.
-    /// </summary>
-    public class EssentialsPartitionController : IPartitionController
-    {
-        private IPartitionStateProvider _partitionSensor;
-
-        private bool isInAutoMode;
-
-        private bool partitionPresent;
-
-        public EssentialsPartitionController(string key, string name, IPartitionStateProvider sensor, bool defaultToManualMode, List<string> adjacentRoomKeys)
-        {
-            Key = key;
-
-            Name = name;
-
-            AdjacentRoomKeys = adjacentRoomKeys;
-
-            if (sensor != null)
-            {
-                _partitionSensor = sensor;
-
-                if (!defaultToManualMode)
-                {
-                    SetAutoMode();
-                }
-                else
-                {
-                    SetManualMode();
-                }
-            }
-            else
-            {
-                SetManualMode();
-            }
-
-            PartitionPresentFeedback.FireUpdate();
-        }
-
-        void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            if (isInAutoMode)
-            {
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        #region IPartitionController Members
-
-        public List<string> AdjacentRoomKeys { get; private set; }
-
-        public void SetAutoMode()
-        {
-            isInAutoMode = true;
-            if (PartitionPresentFeedback != null)
-            {
-                PartitionPresentFeedback.SetValueFunc(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
-            }
-            else
-            {
-                PartitionPresentFeedback = new BoolFeedback(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
-            }
-
-            if (_partitionSensor != null)
-            {
-                _partitionSensor.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
-            }
-        }
-
-        public void SetManualMode()
-        {
-            isInAutoMode = false;
-            if (PartitionPresentFeedback != null)
-            {
-                PartitionPresentFeedback.SetValueFunc(() => partitionPresent);
-            }
-            else
-            {
-                PartitionPresentFeedback = new BoolFeedback(() => partitionPresent);
-            }
-
-            if (_partitionSensor != null)
-            {
-                _partitionSensor.PartitionPresentFeedback.OutputChange -= PartitionPresentFeedback_OutputChange;
-            }
-        }
-
-
-        public void SetPartitionStatePresent()
-        {
-            if (!isInAutoMode)
-            {
-                partitionPresent = true;
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        public void SetPartitionStateNotPresent()
-        {
-            if (!isInAutoMode)
-            {
-                partitionPresent = false;
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        public void ToggglePartitionState()
-        {
-            if (!isInAutoMode)
-            {
-                partitionPresent = !partitionPresent;
-                PartitionPresentFeedback.FireUpdate();
-            }
-        }
-
-        #endregion
-
-        #region IPartitionStateProvider Members
-
-        public BoolFeedback PartitionPresentFeedback { get; private set; }
-
-        #endregion
-
-        #region IKeyName Members
-
-        public string Name { get; private set; }
-
-        #endregion
-
-        #region IKeyed Members
-
-        public string Key { get; private set; }
-
-        #endregion
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -13,13 +13,13 @@ using PepperDash.Essentials.Core.Config;
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for GLS Cresnet Partition Sensor")]
-	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice, IPartitionStateProvider
+	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice
 	{
 		private GlsPartCn _partitionSensor;
 
 		public StringFeedback NameFeedback { get; private set; }
 		public BoolFeedback EnableFeedback { get; private set; }
-		public BoolFeedback PartitionPresentFeedback { get; private set; }
+		public BoolFeedback PartitionSensedFeedback { get; private set; }
 		public BoolFeedback PartitionNotSensedFeedback { get; private set; }
 		public IntFeedback SensitivityFeedback { get; private set; }
 
@@ -39,10 +39,10 @@ namespace PepperDash.Essentials.Core
                 RegisterCrestronGenericBase(_partitionSensor);
 
                 NameFeedback = new StringFeedback(() => Name);
-                EnableFeedback = new BoolFeedback(() => InTestMode ? TestEnableFeedback : _partitionSensor.EnableFeedback.BoolValue);
-                PartitionPresentFeedback = new BoolFeedback(() => InTestMode ? TestPartitionSensedFeedback : _partitionSensor.PartitionSensedFeedback.BoolValue);
-                PartitionNotSensedFeedback = new BoolFeedback(() => InTestMode ? !TestPartitionSensedFeedback : _partitionSensor.PartitionNotSensedFeedback.BoolValue);
-                SensitivityFeedback = new IntFeedback(() => InTestMode ? TestSensitivityFeedback : _partitionSensor.SensitivityFeedback.UShortValue);
+                EnableFeedback = new BoolFeedback(() => _partitionSensor.EnableFeedback.BoolValue);
+                PartitionSensedFeedback = new BoolFeedback(() => _partitionSensor.PartitionSensedFeedback.BoolValue);
+                PartitionNotSensedFeedback = new BoolFeedback(() => _partitionSensor.PartitionNotSensedFeedback.BoolValue);
+                SensitivityFeedback = new IntFeedback(() => _partitionSensor.SensitivityFeedback.UShortValue);
 
                 if (_partitionSensor != null) _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;
             });
@@ -61,7 +61,7 @@ namespace PepperDash.Essentials.Core
 					}
 				case (GlsPartCn.PartitionSensedFeedbackEventId):
 					{
-						PartitionPresentFeedback.FireUpdate();
+						PartitionSensedFeedback.FireUpdate();
 						break;
 					}
 				case (GlsPartCn.PartitionNotSensedFeedbackEventId):
@@ -93,9 +93,6 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestEnableFeedback = state;
-
-			    EnableFeedback.FireUpdate();
-
 				Debug.Console(1, this, "TestEnableFeedback: {0}", TestEnableFeedback.ToString());
 				return;
 			}
@@ -108,10 +105,6 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestPartitionSensedFeedback = state;
-
-                PartitionPresentFeedback.FireUpdate();
-                PartitionNotSensedFeedback.FireUpdate();
-
 				Debug.Console(1, this, "TestPartitionSensedFeedback: {0}", TestPartitionSensedFeedback.ToString());
 				return;
 			}
@@ -124,8 +117,6 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestSensitivityFeedback = value;
-
-                SensitivityFeedback.FireUpdate();
 				Debug.Console(1, this, "TestSensitivityFeedback: {0}", TestSensitivityFeedback);
 				return;
 			}
@@ -195,7 +186,7 @@ namespace PepperDash.Essentials.Core
 			// link output to simpl
 			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
 			EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
-			PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
+			PartitionSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
 			PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
 			SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
 
@@ -225,7 +216,7 @@ namespace PepperDash.Essentials.Core
 			IsOnline.FireUpdate();
 			NameFeedback.FireUpdate();
 			EnableFeedback.FireUpdate();
-			PartitionPresentFeedback.FireUpdate();
+			PartitionSensedFeedback.FireUpdate();
 			PartitionNotSensedFeedback.FireUpdate();
 			SensitivityFeedback.FireUpdate();
 		}
@@ -266,7 +257,7 @@ namespace PepperDash.Essentials.Core
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new GlsPartitionSensorController Device");
+                Debug.Console(1, "Factory Attempting to create new C2N-RTHS Device");
 
                 return new GlsPartitionSensorController(dc.Key, GetGlsPartCnDevice, dc);
             }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/IPartitionStateProvider.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality of a device that senses and provides partition state
-    /// </summary>
-    public interface IPartitionStateProvider : IKeyName
-    {
-        BoolFeedback PartitionPresentFeedback { get; }
-    }
-
-    /// <summary>
-    /// Describes the functionality of a device that can provide partition state either manually via user input or optionally via a sensor state
-    /// </summary>
-    public interface IPartitionController : IPartitionStateProvider
-    {
-        List<string> AdjacentRoomKeys { get; }
-
-        void SetPartitionStatePresent();
-
-        void SetPartitionStateNotPresent();
-
-        void ToggglePartitionState();
-
-        void SetManualMode();
-
-        void SetAutoMode();
-    }
-}

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

@@ -234,9 +234,6 @@
     <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
-    <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
-    <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
-    <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
@@ -291,10 +288,6 @@
     <Compile Include="Remotes\CrestronRemotePropertiesConfig.cs" />
     <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
-    <Compile Include="Room\Combining\EssentialsRoomCombiner.cs" />
-    <Compile Include="Room\Combining\EssentialsRoomCombinerPropertiesConfig.cs" />
-    <Compile Include="Room\Combining\IEssentialsRoomCombiner.cs" />
-    <Compile Include="Room\Combining\RoomCombinationScenario.cs" />
     <Compile Include="Room\EssentialsRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
     <Compile Include="Room\IEssentialsRoom.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs

@@ -1,264 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public class EssentialsRoomCombiner : EssentialsDevice, IEssentialsRoomCombiner
-    {
-        private EssentialsRoomCombinerPropertiesConfig _propertiesConfig;
-
-        private IRoomCombinationScenario _currentScenario;
-
-        private List<IEssentialsRoom> _rooms;
-
-        private bool isInAutoMode;
-
-        private CTimer _scenarioChangeDebounceTimer;
-
-        private int _scenarioChangeDebounceTimeSeconds = 10; // default to 10s
-
-        public EssentialsRoomCombiner(string key, EssentialsRoomCombinerPropertiesConfig props)
-            : base(key)
-        {
-            _propertiesConfig = props;
-
-            Partitions = new List<IPartitionController>();
-            RoomCombinationScenarios = new List<IRoomCombinationScenario>();
-
-            if (_propertiesConfig.ScenarioChangeDebounceTimeSeconds > 0)
-            {
-                _scenarioChangeDebounceTimeSeconds = _propertiesConfig.ScenarioChangeDebounceTimeSeconds;
-            }
-
-            IsInAutoModeFeedback = new BoolFeedback(() => isInAutoMode);
-
-            // default to auto mode
-            isInAutoMode = true;
-
-            if (_propertiesConfig.defaultToManualMode)
-            {
-                isInAutoMode = false;
-            }
-
-            IsInAutoModeFeedback.FireUpdate();
-
-            CreateScenarios();
-
-            AddPostActivationAction(() =>
-            {
-                SetupPartitionStateProviders();
-
-                SetRooms();
-            });
-        }
-
-        void CreateScenarios()
-        {
-            RoomCombinationScenarios = new List<IRoomCombinationScenario>();
-
-            foreach (var scenarioConfig in _propertiesConfig.Scenarios)
-            {
-                var scenario = new RoomCombinationScenario(scenarioConfig);
-                RoomCombinationScenarios.Add(scenario);
-            }
-        }
-
-        void SetRooms()
-        {
-            _rooms = new List<IEssentialsRoom>();
-
-            foreach (var roomKey in _propertiesConfig.RoomKeys)
-            {
-                var room = DeviceManager.GetDeviceForKey(roomKey) as IEssentialsRoom;
-                if (room != null)
-                {
-                    _rooms.Add(room);
-                }
-            }
-        }
-
-        void SetupPartitionStateProviders()
-        {
-            foreach (var pConfig in _propertiesConfig.Partitions)
-            {
-                var sensor = DeviceManager.GetDeviceForKey(pConfig.DeviceKey) as IPartitionStateProvider;
-
-                var partition = new EssentialsPartitionController(pConfig.Key, pConfig.Name, sensor, _propertiesConfig.defaultToManualMode, pConfig.AdjacentRoomKeys);
-
-                partition.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
-
-                Partitions.Add(partition);
-            }
-        }
-
-        void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
-        {
-            StartDebounceTimer();
-        }
-
-        void StartDebounceTimer()
-        {
-            var time = _scenarioChangeDebounceTimeSeconds * 1000;
-
-            if (_scenarioChangeDebounceTimer == null)
-            {
-                _scenarioChangeDebounceTimer = new CTimer((o) => DetermineRoomCombinationScenario(), time);
-            }
-            else
-            {
-                _scenarioChangeDebounceTimer.Reset(time);
-            }
-        }
-
-        /// <summary>
-        /// Determines the current room combination scenario based on the state of the partition sensors
-        /// </summary>
-        void DetermineRoomCombinationScenario()
-        {
-            if (_scenarioChangeDebounceTimer != null)
-            {
-                _scenarioChangeDebounceTimer.Dispose();
-                _scenarioChangeDebounceTimer = null;
-            }
-
-            var currentScenario = RoomCombinationScenarios.FirstOrDefault((s) =>
-            {
-                // iterate the partition states
-                foreach (var partitionState in s.PartitionStates)
-                {
-                    // get the partition by key
-                    var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionState.PartitionKey));
-
-                    if (partition != null && partitionState.PartitionPresent != partition.PartitionPresentFeedback.BoolValue)
-                    {
-                        // the partition can't be found or the state doesn't match
-                        return false;
-                    }
-                }
-                // if it hasn't returned false by now we have the matching scenario
-                return true;
-            });
-
-            if (currentScenario != null)
-            {
-                CurrentScenario = currentScenario;
-            }
-        }
-
-        #region IEssentialsRoomCombiner Members
-
-        public event EventHandler<EventArgs> RoomCombinationScenarioChanged;
-
-        public IRoomCombinationScenario CurrentScenario
-        {
-            get
-            {
-                return _currentScenario;
-            }
-            set
-            {
-                if (value != _currentScenario)
-                {
-                    _currentScenario = value;
-                    Debug.Console(1, this, "Current Scenario: {0}", _currentScenario.Name);
-                    var handler = RoomCombinationScenarioChanged;
-                    if (handler != null)
-                    {
-                        handler(this, new EventArgs());
-                    }
-                }
-            }
-        }
-
-        public BoolFeedback IsInAutoModeFeedback { get; private set; }
-
-        public void SetAutoMode()
-        {
-            isInAutoMode = true;
-            IsInAutoModeFeedback.FireUpdate();
-        }
-
-        public void SetManualMode()
-        {
-            isInAutoMode = false;
-            IsInAutoModeFeedback.FireUpdate();
-        }
-
-        public void ToggleMode()
-        {
-            isInAutoMode = !isInAutoMode;
-            IsInAutoModeFeedback.FireUpdate();
-        }
-
-        public List<IRoomCombinationScenario> RoomCombinationScenarios { get; private set; }
-
-        public List<IPartitionController> Partitions { get; private set; }
-
-        public void TogglePartitionState(string partitionKey)
-        {
-            var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionKey)) as IPartitionController;
-
-            if (partition != null)
-            {
-                partition.ToggglePartitionState();
-            }
-        }
-
-        public void SetRoomCombinationScenario(string scenarioKey)
-        {
-            if (isInAutoMode)
-            {
-                Debug.Console(0, this, "Cannot set room combination scenario when in auto mode.  Set to auto mode first.");
-                return;
-            }
-
-            // Get the scenario
-            var scenario = RoomCombinationScenarios.FirstOrDefault((s) => s.Key.Equals(scenarioKey));
-
-            // Set the parition states from the scenario manually
-            if (scenario != null)
-            {
-                foreach (var partitionState in scenario.PartitionStates)
-                {
-                    var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionState.PartitionKey));
-
-                    if (partition != null)
-                    {
-                        if (partitionState.PartitionPresent)
-                        {
-                            partition.SetPartitionStatePresent();
-                        }
-                        else
-                        {
-                            partition.SetPartitionStateNotPresent();
-                        }
-                    }
-                }
-            }
-        }
-
-        #endregion
-    }
-
-    public class EssentialsRoomCombinerFactory : EssentialsDeviceFactory<EssentialsRoomCombiner>
-    {
-        public EssentialsRoomCombinerFactory()
-        {
-            TypeNames = new List<string> { "essentialsroomcombiner" };
-        }
-
-        public override EssentialsDevice BuildDevice(PepperDash.Essentials.Core.Config.DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new EssentialsRoomCombiner Device");
-
-            var props = dc.Properties.ToObject<EssentialsRoomCombinerPropertiesConfig>();
-
-            return new EssentialsRoomCombiner(dc.Key, props);
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs

@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Config properties for an EssentialsRoomCombiner device
-    /// </summary>
-    public class EssentialsRoomCombinerPropertiesConfig
-    {
-        /// <summary>
-        /// The list of partitions that device the rooms
-        /// </summary>
-        [JsonProperty("partitions")]
-        public List<PartitionConfig> Partitions {get; set;}
-
-        /// <summary>
-        /// The list of combinations scenarios for the rooms
-        /// </summary>
-        [JsonProperty("scenarios")]
-        public List<RoomCombinationScenarioConfig> Scenarios { get; set; }
-
-        /// <summary>
-        /// The list of rooms keys that can be combined
-        /// </summary>
-        [JsonProperty("roomMap")]
-        public List<string> RoomKeys {get; set;}
-
-        /// <summary>
-        /// Set to true to default to manual mode
-        /// </summary>
-        [JsonProperty("defaultToManualMode")]
-        public bool defaultToManualMode { get; set; }
-
-        /// <summary>
-        /// The key of the scenario to default to at system startup if in manual mode
-        /// </summary>
-        [JsonProperty("defaultScenarioKey")]
-        public string defaultScenarioKey { get; set; }
-
-        [JsonProperty("scenarioChangeDebounceTimeSeconds")]
-        public int ScenarioChangeDebounceTimeSeconds { get; set; }
-    }
-
-    /// <summary>
-    /// Config properties for a partition that separates rooms
-    /// </summary>
-    public class PartitionConfig : IKeyName
-    {
-        [JsonProperty("key")]
-        public string Key { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Key of the device that implements IPartitionStateProvider to provide the state of the partition
-        /// </summary>
-        [JsonProperty("deviceKey")]
-        public string DeviceKey { get; set; }
-
-        /// <summary>
-        /// Keys of the rooms that this partion would be located between
-        /// </summary>
-        [JsonProperty("adjacentRoomKeys")]
-        public List<string> AdjacentRoomKeys { get; set; }
-    }
-
-    /// <summary>
-    /// Config propeties for a room combination scenario
-    /// </summary>
-    public class RoomCombinationScenarioConfig : IKeyName
-    {
-        [JsonProperty("key")]
-        public string Key { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("partitionStates")]
-        public List<PartitionState> PartitionStates { get; set; }
-
-        [JsonProperty("uiMap")]
-        public Dictionary<string, string> UiMap { get; set; }
-
-        [JsonProperty("activationActions")]
-        public List<DeviceActionWrapper> ActivationActions { get; set; }
-
-        [JsonProperty("deactivationActions")]
-        public List<DeviceActionWrapper> DeactivationActions { get; set; }    
-    }
-
-    /// <summary>
-    /// Config properties to represent the state of a partition sensor in a RoomCombinationScenario
-    /// </summary>
-    public class PartitionState
-    {
-        [JsonProperty("partitionKey")]
-        public string PartitionKey { get; set; }
-
-        [JsonProperty("partitionSensedState")]
-        public bool PartitionPresent { get; set; }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/IEssentialsRoomCombiner.cs

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality for an EssentailsRoomCombiner device
-    /// </summary>
-    public interface IEssentialsRoomCombiner : IKeyed
-    {
-        /// <summary>
-        /// Indicates that the room combination scenario has changed
-        /// </summary>
-        event EventHandler<EventArgs> RoomCombinationScenarioChanged;
-
-        /// <summary>
-        /// The current room combination scenario
-        /// </summary>
-        IRoomCombinationScenario CurrentScenario { get; }
-
-        /// <summary>
-        /// When true, indicates the current mode is auto mode
-        /// </summary>
-        BoolFeedback IsInAutoModeFeedback {get;}
-
-        /// <summary>
-        /// Sets auto mode
-        /// </summary>
-        void SetAutoMode();
-
-        /// <summary>
-        /// Sets manual mode
-        /// </summary>
-        void SetManualMode();
-
-        /// <summary>
-        /// Toggles the current mode between auto and manual
-        /// </summary>
-        void ToggleMode();
-
-        /// <summary>
-        /// The available room combinatino scenarios
-        /// </summary>
-        List<IRoomCombinationScenario> RoomCombinationScenarios { get; }
-
-        /// <summary>
-        /// The partition
-        /// </summary>
-        List<IPartitionController> Partitions { get; }
-
-        /// <summary>
-        /// Toggles the state of a manual partition sensor
-        /// </summary>
-        /// <param name="partitionKey"></param>
-        void TogglePartitionState(string partitionKey);
-
-        /// <summary>
-        /// Sets the room combination scenario (if in manual mode)
-        /// </summary>
-        /// <param name="scenarioKey"></param>
-        void SetRoomCombinationScenario(string scenarioKey);
-    }
-
-    public interface IRoomCombinationScenario : IKeyName
-    {
-        /// <summary>
-        /// When true, indicates that this room combination scenario is active
-        /// </summary>
-        BoolFeedback IsActiveFeedback { get; }
-
-        /// <summary>
-        /// Activates this room combination scenario
-        /// </summary>
-        void Activate();
-
-        /// <summary>
-        /// The state of the partitions that would activate this scenario
-        /// </summary>
-        List<PartitionState> PartitionStates { get; }
-
-        /// <summary>
-        /// The mapping of UIs by key to rooms by key
-        /// </summary>
-        Dictionary<string, string> UiMap { get; set; }
-    }
-
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/RoomCombinationScenario.cs

@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Represents a room combination scenario
-    /// </summary>
-    public class RoomCombinationScenario: IRoomCombinationScenario
-    {
-        private RoomCombinationScenarioConfig _config;
-
-        public string Key { get; set; }
-
-        public string Name { get; set; }
-
-        public List<PartitionState> PartitionStates { get; private set; }
-
-        public Dictionary<string, string> UiMap { get; set; }
-
-        private bool _isActive;
-
-        public BoolFeedback IsActiveFeedback { get; private set; }
-
-        List<DeviceActionWrapper> activationActions;
-
-        List<DeviceActionWrapper> deactivationActions;
-
-        public RoomCombinationScenario(RoomCombinationScenarioConfig config)
-        {
-            Key = config.Key;
-
-            Name = config.Name;
-
-            PartitionStates = config.PartitionStates;
-
-            UiMap = config.UiMap;
-
-            activationActions = config.ActivationActions;
-
-            deactivationActions = config.DeactivationActions;
-
-            _config = config;
-
-            IsActiveFeedback = new BoolFeedback(() => _isActive);
-        }
-
-        public void Activate()
-        {
-            if (activationActions != null)
-            {
-                foreach (var action in activationActions)
-                {
-                    DeviceJsonApi.DoDeviceAction(action);
-                }
-            }
-
-            _isActive = true;
-            IsActiveFeedback.FireUpdate();
-        }
-
-        public void Deactivate()
-        {
-            if (deactivationActions != null)
-            {
-                foreach (var action in deactivationActions)
-                {
-                    DeviceJsonApi.DoDeviceAction(action);
-                }
-            }
-
-            _isActive = false;
-            IsActiveFeedback.FireUpdate();
-        }
-
-    }
-
-}

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmBladeChassisController.cs

@@ -16,8 +16,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.DM.Config;
 
-namespace PepperDash.Essentials.DM
-{
+namespace PepperDash.Essentials.DM {
     /// <summary>
     /// Builds a controller for basic DM-RMCs with Com and IR ports and no control functions
     /// 
@@ -76,10 +75,8 @@ namespace PepperDash.Essentials.DM
         /// Factory method to create a new chassis controller from config data. Limited to 8x8 right now
         /// </summary>
         public static DmBladeChassisController GetDmChassisController(string key, string name,
-            string type, DMChassisPropertiesConfig properties)
-        {
-            try
-            {
+            string type, DMChassisPropertiesConfig properties) {
+            try {
                 type = type.ToLower();
                 uint ipid = properties.Control.IpIdInt;
 
@@ -88,8 +85,7 @@ namespace PepperDash.Essentials.DM
                 else if (type == "dmmd128x128") { chassis = new DmMd128x128(ipid, Global.ControlSystem); }
 
 
-                if (chassis == null)
-                {
+                if (chassis == null) {
                     return null;
                 }
 
@@ -97,13 +93,11 @@ namespace PepperDash.Essentials.DM
                 // add the cards and port names
                 foreach (var kvp in properties.InputSlots)
                     controller.AddInputBlade(kvp.Value, kvp.Key);
-                foreach (var kvp in properties.OutputSlots)
-                {
+                foreach (var kvp in properties.OutputSlots) {
                     controller.AddOutputBlade(kvp.Value, kvp.Key);
                 }
 
-                foreach (var kvp in properties.VolumeControls)
-                {
+                foreach (var kvp in properties.VolumeControls) {
                     // get the card
                     // check it for an audio-compatible type
                     // make a something-something that will make it work
@@ -129,8 +123,7 @@ namespace PepperDash.Essentials.DM
                 controller.PropertiesConfig = properties;
                 return controller;
             }
-            catch (System.Exception e)
-            {
+            catch (System.Exception e) {
                 Debug.Console(0, "Error creating DM chassis:\r{0}", e);
             }
             return null;
@@ -144,8 +137,7 @@ namespace PepperDash.Essentials.DM
         /// <param name="name"></param>
         /// <param name="chassis"></param>
         public DmBladeChassisController(string key, string name, BladeSwitch chassis)
-            : base(key, name, chassis)
-        {
+            : base(key, name, chassis) {
             Chassis = chassis;
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
             OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
@@ -169,87 +161,68 @@ namespace PepperDash.Essentials.DM
             InputCardHdcpCapabilityFeedbacks = new Dictionary<uint, IntFeedback>();
             InputCardHdcpCapabilityTypes = new Dictionary<uint, eHdcpCapabilityType>();
 
-            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++)
-            {
+            for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) {
                 var tempX = x;
 
-                if (Chassis.Outputs[tempX] != null)
-                {
-                    VideoOutputFeedbacks[tempX] = new IntFeedback(() =>
-                    {
+                if (Chassis.Outputs[tempX] != null) {
+                    VideoOutputFeedbacks[tempX] = new IntFeedback(() => {
                         if (Chassis.Outputs[tempX].VideoOutFeedback != null) { return (ushort)Chassis.Outputs[tempX].VideoOutFeedback.Number; }
                         else { return 0; };
                     });
 
-                    OutputNameFeedbacks[tempX] = new StringFeedback(() =>
-                    {
-                        if (Chassis.Outputs[tempX].NameFeedback != null)
-                        {
+                    OutputNameFeedbacks[tempX] = new StringFeedback(() => {
+                        if (Chassis.Outputs[tempX].NameFeedback != null) {
                             return Chassis.Outputs[tempX].NameFeedback.StringValue;
                         }
-                        else
-                        {
+                        else {
                             return "";
                         }
                     });
-                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() =>
-                    {
-                        if (Chassis.Outputs[tempX].VideoOutFeedback != null)
-                        {
+                    OutputVideoRouteNameFeedbacks[tempX] = new StringFeedback(() => {
+                        if (Chassis.Outputs[tempX].VideoOutFeedback != null) {
                             return Chassis.Outputs[tempX].VideoOutFeedback.NameFeedback.StringValue;
                         }
-                        else
-                        {
+                        else {
                             return "";
                         }
                     });
 
-                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() =>
-                    {
+                    OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
                         //if (Chassis.Outputs[tempX].Endpoint != null)
                         //    return Chassis.Outputs[tempX].Endpoint.IsOnline;
                         //else
-                        return Chassis.Outputs[tempX].EndpointOnlineFeedback;
+                            return Chassis.Outputs[tempX].EndpointOnlineFeedback;
                     });
                 }
 
-                if (Chassis.Inputs[tempX] != null)
-                {
-                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() =>
-                    {
+                if (Chassis.Inputs[tempX] != null) {
+                    UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() => {
                         if (Chassis.Inputs[tempX].USBRoutedToFeedback != null) { return (ushort)Chassis.Inputs[tempX].USBRoutedToFeedback.Number; }
                         else { return 0; };
                     });
-                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() =>
-                    {
+                    VideoInputSyncFeedbacks[tempX] = new BoolFeedback(() => {
                         if (Chassis.Inputs[tempX].VideoDetectedFeedback != null)
                             return Chassis.Inputs[tempX].VideoDetectedFeedback.BoolValue;
                         else
                             return false;
                     });
-                    InputNameFeedbacks[tempX] = new StringFeedback(() =>
-                    {
-                        if (Chassis.Inputs[tempX].NameFeedback != null)
-                        {
+                    InputNameFeedbacks[tempX] = new StringFeedback(() => {
+                        if (Chassis.Inputs[tempX].NameFeedback != null) {
                             return Chassis.Inputs[tempX].NameFeedback.StringValue;
                         }
-                        else
-                        {
+                        else {
                             return "";
                         }
                     });
 
-                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() =>
-                    {
+                    InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => {
                         return Chassis.Inputs[tempX].EndpointOnlineFeedback;
                     });
 
-                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() =>
-                    {
+                    InputCardHdcpCapabilityFeedbacks[tempX] = new IntFeedback(() => {
                         var inputCard = Chassis.Inputs[tempX];
 
-                        if (inputCard.Card is DmHdmi4kInputBladeCard)
-                        {
+                        if (inputCard.Card is DmHdmi4kInputBladeCard) {
                             InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
 
                             if ((inputCard.Card as DmHdmi4kInputBladeCard).Hdmi4kInput.HdcpSupportOnFeedback.BoolValue)
@@ -258,8 +231,7 @@ namespace PepperDash.Essentials.DM
                                 return 0;
                         }
 
-                        if (inputCard.Card is DmC4kInputBladeCard)
-                        {
+                        if (inputCard.Card is DmC4kInputBladeCard) {
                             InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
 
                             if ((inputCard.Card as DmC4kInputBladeCard).DmInput.HdcpCapabilityFeedback.Equals(eHdcpCapabilityType.HdcpSupportOff))
@@ -280,56 +252,45 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         /// <param name="type"></param>
         /// <param name="number"></param>
-        public void AddInputBlade(string type, uint number)
-        {
+        public void AddInputBlade(string type, uint number) {
             Debug.Console(2, this, "Adding input blade '{0}', slot {1}", type, number);
 
             type = type.ToLower();
 
-            if (type == "dmb4kihd")
-            {
+            if (type == "dmb4kihd") {
                 var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
                     var cecPort = card as ICec;
                     AddHdmiInBladePorts(item.Number, cecPort);
                 }
             }
 
-            else if (type == "dmb4kihddnt")
-            {
+            else if (type == "dmb4kihddnt") {
                 var inputBlade = new Dmb4kIHd(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     var card = (item.Card as DmHdmi4kInputBladeCard).Hdmi4kInput;
                     var cecPort = card as ICec;
                     AddHdmiInBladePorts(item.Number, cecPort);
                 }
             }
 
-            else if (type == "dmb4kic")
-            {
+            else if (type == "dmb4kic") {
                 var inputBlade = new Dmb4kIC(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     AddDmInBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmbis")
-            {
+            else if (type == "dmbis") {
                 var inputBlade = new DmbIS(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     AddDmInMmFiberPorts(item.Number);
                 }
             }
-            else if (type == "dmbis2")
-            {
+            else if (type == "dmbis2") {
                 var inputBlade = new DmbIS2(number, this.Chassis);
-                foreach (var item in inputBlade.Inputs)
-                {
+                foreach (var item in inputBlade.Inputs) {
                     AddDmInSmFiberPorts(item.Number);
                 }
             }
@@ -343,26 +304,22 @@ namespace PepperDash.Essentials.DM
         {
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
-        }
+        }
 
 
-        void AddHdmiInBladePorts(uint number, ICec cecPort)
-        {
+        void AddHdmiInBladePorts(uint number, ICec cecPort) {
             AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort);
         }
 
-        void AddDmInBladePorts(uint number)
-        {
+        void AddDmInBladePorts(uint number) {
             AddInputPortWithDebug(number, "dmCIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat);
         }
 
-        void AddDmInMmFiberPorts(uint number)
-        {
+        void AddDmInMmFiberPorts(uint number) {
             AddInputPortWithDebug(number, "dmMmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
         }
 
-        void AddDmInSmFiberPorts(uint number)
-        {
+        void AddDmInSmFiberPorts(uint number) {
             AddInputPortWithDebug(number, "dmSmIn", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
         }
 
@@ -371,81 +328,64 @@ namespace PepperDash.Essentials.DM
         /// </summary>
         /// <param name="type"></param>
         /// <param name="number"></param>
-        public void AddOutputBlade(string type, uint number)
-        {
+        public void AddOutputBlade(string type, uint number) {
             type = type.ToLower();
 
             Debug.Console(2, this, "Adding output blade '{0}', slot {1}", type, number);
-            if (type == "dmb4kohd")
-            {
+            if (type == "dmb4kohd") {
                 var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddHdmiOutBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmb4kohddnt")
-            {
+            else if (type == "dmb4kohddnt") {
                 var outputBlade = new Dmb4KOHD(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddHdmiOutBladePorts(item.Number);
                 }
             }
 
-            else if (type == "dmb4koc")
-            {
+            else if (type == "dmb4koc") {
                 var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutBladePorts(item.Number);
                 }
             }
-            else if (type == "dmb4koc")
-            {
+            else if (type == "dmb4koc") {
                 var outputBlade = new Dmb4KOC(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutBladePorts(item.Number);
                 }
             }
-            else if (type == "dmbos")
-            {
+            else if (type == "dmbos") {
                 var outputBlade = new DmbOS(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutMmFiberBladePorts(item.Number);
                 }
             }
-            else if (type == "dmbos2")
-            {
+            else if (type == "dmbos2") {
                 var outputBlade = new DmbOS2(number, Chassis);
-                foreach (var item in outputBlade.Outputs)
-                {
+                foreach (var item in outputBlade.Outputs) {
                     AddDmOutSmFiberBladePorts(item.Number);
                 }
             }
         }
 
-        void AddHdmiOutBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "hdmiOut", eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, Chassis.Outputs[number]);
+        void AddHdmiOutBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("hdmiOut{0}", number) , eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, Chassis.Outputs[number]);
         }
 
-        void AddDmOutBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, Chassis.Outputs[number]);
+        void AddDmOutBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, Chassis.Outputs[number]);
         }
 
-        void AddDmOutMmFiberBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmMmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, Chassis.Outputs[number]);
+        void AddDmOutMmFiberBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, Chassis.Outputs[number]);
         }
 
-        void AddDmOutSmFiberBladePorts(uint number)
-        {
-            AddOutputPortWithDebug(number, "dmSmOut", eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, Chassis.Outputs[number]);
+        void AddDmOutSmFiberBladePorts(uint number) {
+            AddOutputPortWithDebug(String.Format("outputBlade{0}", (number / 8 > 0 ? 1 : number / 8)), String.Format("dmOut{0}", number), eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, Chassis.Outputs[number]);
         }
 
 
@@ -477,44 +417,23 @@ namespace PepperDash.Essentials.DM
         }
 
 
-        
-        /*void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
+        /// <summary>
+        /// Adds OutputPort
+        /// </summary>
+        void AddOutputPortWithDebug(string cardName, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector) {
             var portKey = string.Format("{0}--{1}", cardName, portName);
             Debug.Console(2, this, "Adding output port '{0}'", portKey);
             OutputPorts.Add(new RoutingOutputPort(portKey, sigType, portType, selector, this)
             {
                 FeedbackMatchObject = Chassis.Outputs[(uint)selector]
             });
-        }*/
-
-        /// <summary>
-        /// Adds OutputPort
-        /// </summary>
-        void AddOutputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, object selector)
-        {
-            try
-            {
-                var portKey = string.Format("outputCard{0}--{1}", cardNum, portName);
-                Debug.Console(2, this, "Adding output port '{0}'", portKey);
-                var outputPort = new RoutingOutputPort(portKey, sigType, portType, selector, this)
-                {
-                    FeedbackMatchObject = Chassis.Outputs[cardNum]
-                };
-                OutputPorts.Add(outputPort);
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, this, "Exception : {0}", ex);
-            }
-
         }
 
 
         /// <summary>
         /// 
         /// </summary>
-        void AddVolumeControl(uint number, Audio.Output audio)
-        {
+        void AddVolumeControl(uint number, Audio.Output audio) {
             VolumeControls.Add(number, new DmCardAudioOutputController(audio));
         }
 
@@ -524,43 +443,35 @@ namespace PepperDash.Essentials.DM
         //}
 
 
-        void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
-        {
+        void Chassis_DMInputChange(Switch device, DMInputEventArgs args) {
 
-            switch (args.EventId)
-            {
-                case DMInputEventIds.EndpointOnlineEventId:
-                    {
+            switch (args.EventId) {
+                case DMInputEventIds.EndpointOnlineEventId: {
                         Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
                         InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.OnlineFeedbackEventId:
-                    {
+                case DMInputEventIds.OnlineFeedbackEventId: {
                         Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
                         InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.VideoDetectedEventId:
-                    {
+                case DMInputEventIds.VideoDetectedEventId: {
                         Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
                         VideoInputSyncFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.InputNameEventId:
-                    {
+                case DMInputEventIds.InputNameEventId: {
                         Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
                         InputNameFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                case DMInputEventIds.HdcpCapabilityFeedbackEventId:
-                    {
+                case DMInputEventIds.HdcpCapabilityFeedbackEventId: {
                         Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
                         InputCardHdcpCapabilityFeedbacks[args.Number].FireUpdate();
                         break;
                     }
-                default:
-                    {
+                default: {
                         Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
                         break;
                     }
@@ -576,74 +487,74 @@ namespace PepperDash.Essentials.DM
             switch (args.EventId)
             {
                 case DMOutputEventIds.VolumeEventId:
+                {
+                    if (VolumeControls.ContainsKey(output))
                     {
-                        if (VolumeControls.ContainsKey(output))
-                        {
-                            VolumeControls[args.Number].VolumeEventFromChassis();
-                        }
-                        break;
+                        VolumeControls[args.Number].VolumeEventFromChassis();
                     }
+                    break;
+                }
                 case DMOutputEventIds.EndpointOnlineEventId:
-                    {
+                {
+                    Debug.Console(2, this,
+                        "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}",
+                        args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
+                    if (Chassis.Outputs[output].Endpoint != null)
                         Debug.Console(2, this,
-                            "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. EndpointOnlineFeedback State: {1}",
-                            args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                        if (Chassis.Outputs[output].Endpoint != null)
-                            Debug.Console(2, this,
-                                "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}",
-                                args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
+                            "Output {0} DMOutputEventIds.EndpointOnlineEventId fired. Endpoint.IsOnline State: {1}",
+                            args.Number, Chassis.Outputs[output].Endpoint.IsOnline);
 
-                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                        break;
-                    }
+                    OutputEndpointOnlineFeedbacks[output].FireUpdate();
+                    break;
+                }
                 case DMOutputEventIds.OnlineFeedbackEventId:
-                    {
-                        Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}",
-                            args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
-                        OutputEndpointOnlineFeedbacks[output].FireUpdate();
-                        break;
-                    }
+                {
+                    Debug.Console(2, this, "Output {0} DMInputEventIds.OnlineFeedbackEventId fired. State: {1}",
+                        args.Number, Chassis.Outputs[output].EndpointOnlineFeedback);
+                    OutputEndpointOnlineFeedbacks[output].FireUpdate();
+                    break;
+                }
                 case DMOutputEventIds.VideoOutEventId:
+                {
+
+                    var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.Outputs[output].VideoOutFeedback.Number;
+
+                    Debug.Console(2, this, "DMSwitchAudioVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
+                        inputNumber, output);
+
+                    if (VideoOutputFeedbacks.ContainsKey(output))
                     {
-
-                        var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.Outputs[output].VideoOutFeedback.Number;
-
-                        Debug.Console(2, this, "DMSwitchAudioVideo:{0} Routed Input:{1} Output:{2}'", this.Name,
-                            inputNumber, output);
-
-                        if (VideoOutputFeedbacks.ContainsKey(output))
-                        {
-                            var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].VideoOutFeedback);
-                            var localOutputPort =
-                                OutputPorts.FirstOrDefault(p => (DMOutput)p.FeedbackMatchObject == Chassis.Outputs[output]);
+                        var localInputPort = InputPorts.FirstOrDefault(p => (DMInput)p.FeedbackMatchObject == Chassis.Outputs[output].VideoOutFeedback);
+                        var localOutputPort =
+                            OutputPorts.FirstOrDefault(p => (DMOutput) p.FeedbackMatchObject == Chassis.Outputs[output]);
 
 
-                            VideoOutputFeedbacks[output].FireUpdate();
-                            OnSwitchChange(new RoutingNumericEventArgs(output,
-                                inputNumber,
-                                localOutputPort,
-                                localInputPort,
-                                eRoutingSignalType.AudioVideo));
+                        VideoOutputFeedbacks[output].FireUpdate();
+                        OnSwitchChange(new RoutingNumericEventArgs(output,
+                            inputNumber,
+                            localOutputPort,
+                            localInputPort,
+                            eRoutingSignalType.AudioVideo));
 
-                        }
-                        if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
-                        {
-                            OutputVideoRouteNameFeedbacks[output].FireUpdate();
-                        }
-                        break;
                     }
+                    if (OutputVideoRouteNameFeedbacks.ContainsKey(output))
+                    {
+                        OutputVideoRouteNameFeedbacks[output].FireUpdate();
+                    }
+                    break;
+                }
                 case DMOutputEventIds.OutputNameEventId:
-                    {
-                        Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
-                        OutputNameFeedbacks[output].FireUpdate();
-                        break;
-                    }
+                {
+                    Debug.Console(2, this, "DM Output {0} NameFeedbackEventId", output);
+                    OutputNameFeedbacks[output].FireUpdate();
+                    break;
+                }
                 default:
-                    {
-                        Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}",
-                            args.Number, args.EventId);
-                        break;
-                    }
+                {
+                    Debug.Console(2, this, "DMOutputChange fired for Output {0} with Unhandled EventId: {1}",
+                        args.Number, args.EventId);
+                    break;
+                }
             }
 
         }
@@ -653,8 +564,7 @@ namespace PepperDash.Essentials.DM
         /// 
         /// </summary>
         /// <param name="pnt"></param>
-        void StartOffTimer(PortNumberType pnt)
-        {
+        void StartOffTimer(PortNumberType pnt) {
             if (RouteOffTimers.ContainsKey(pnt))
                 return;
             RouteOffTimers[pnt] = new CTimer(o => ExecuteSwitch(null, pnt.Selector, pnt.Type), RouteOffTime);
@@ -662,10 +572,8 @@ namespace PepperDash.Essentials.DM
 
 
         // Send out sigs when coming online
-        void IsOnline_OutputChange(object sender, EventArgs e)
-        {
-            if (IsOnline.BoolValue)
-            {
+        void IsOnline_OutputChange(object sender, EventArgs e) {
+            if (IsOnline.BoolValue) {
                 Chassis.EnableUSBBreakaway.BoolValue = true;
 
                 if (InputNames != null)
@@ -679,13 +587,12 @@ namespace PepperDash.Essentials.DM
 
         #region IRouting Members
 
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType)
-        {
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType sigType) {
             Debug.Console(2, this, "Making an awesome DM route from {0} to {1} {2}", inputSelector, outputSelector, sigType);
 
             var input = inputSelector as DMInput; // Cast can sometimes fail
             var output = outputSelector as DMOutput;
-
+            
 
             if (output == null)
             {
@@ -698,14 +605,11 @@ namespace PepperDash.Essentials.DM
             // Check to see if there's an off timer waiting on this and if so, cancel
             var key = new PortNumberType(output, sigType);
 
-            if (input == null)
-            {
+            if (input == null) {
                 StartOffTimer(key);
             }
-            else
-            {
-                if (RouteOffTimers.ContainsKey(key))
-                {
+            else {
+                if (RouteOffTimers.ContainsKey(key)) {
                     Debug.Console(2, this, "{0} cancelling route off due to new source", output);
                     RouteOffTimers[key].Stop();
                     RouteOffTimers.Remove(key);
@@ -767,7 +671,7 @@ namespace PepperDash.Essentials.DM
                 var ioSlotJoin = ioSlot - 1;
 
                 // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort)ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
 
                 if (TxDictionary.ContainsKey(ioSlot))
                 {

essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/InputInterfaces.cs

@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Displays
-{
-    public interface IInputHdmi1 { void InputHdmi1(); }
-    public interface IInputHdmi2 { void InputHdmi2(); }
-    public interface IInputHdmi3 { void InputHdmi3(); }
-    public interface IInputHdmi4 { void InputHdmi4(); }
-    public interface IInputDisplayPort1 { void InputDisplayPort1(); }
-    public interface IInputDisplayPort2 { void InputDisplayPort2(); }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Displays
+{
+    public interface IInputHdmi1 { void InputHdmi1(); }
+    public interface IInputHdmi2 { void InputHdmi2(); }
+    public interface IInputHdmi3 { void InputHdmi3(); }
+    public interface IInputHdmi4 { void InputHdmi4(); }
+    public interface IInputDisplayPort1 { void InputDisplayPort1(); }
+    public interface IInputDisplayPort2 { void InputDisplayPort2(); }
     public interface IInputVga1 { void InputVga1(); }
 
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -314,7 +314,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			FarEndIsSharingContentFeedback = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);
             CameraIsOffFeedback = new BoolFeedback(() => CodecStatus.Status.Video.Input.MainVideoMute.BoolValue);
             CameraIsMutedFeedback = CameraIsOffFeedback;
-            SupportsCameraOff = true;
+
 
 			PresentationViewMaximizedFeedback = new BoolFeedback(() => CurrentPresentationView == "Maximized");
 
@@ -417,7 +417,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
             CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
             CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = CameraAutoModeIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Cameras.SpeakerTrack.Availability.ValueChangedAction = () => { SupportsCameraAutoMode = CodecStatus.Status.Cameras.SpeakerTrack.Availability.BoolValue; };
             CodecStatus.Status.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
             CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
             CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
@@ -551,13 +550,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CrestronConsole.AddNewConsoleCommand(GetPhonebook, "GetCodecPhonebook", "Triggers a refresh of the codec phonebook", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(GetBookings, "GetCodecBookings", "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
-            return base.CustomActivate();
-        }
-
-        #region Overrides of Device
-
-        public override void Initialize()
-        {
             var socket = Communication as ISocketStatus;
             if (socket != null)
             {
@@ -566,9 +558,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             Communication.Connect();
 
-            CommunicationMonitor.Start();
+			CommunicationMonitor.Start();
 
-            const string prefix = "xFeedback register ";
+            string prefix = "xFeedback register ";
 
             CliFeedbackRegistrationExpression =
                 prefix + "/Configuration" + Delimiter +
@@ -583,13 +575,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Status/Video/Layout" + Delimiter +
                 prefix + "/Status/Video/Input/MainVideoMute" + Delimiter +
                 prefix + "/Bookings" + Delimiter +
-                prefix + "/Event/CallDisconnect" + Delimiter +
+                prefix + "/Event/CallDisconnect" + Delimiter + 
                 prefix + "/Event/Bookings" + Delimiter +
                 prefix + "/Event/CameraPresetListUpdated" + Delimiter +
-                prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
-        }
+				prefix + "/Event/UserInterface/Presentation/ExternalSource/Selected/SourceIdentifier" + Delimiter;
 
-        #endregion
+            return base.CustomActivate();
+        }
 
         /// <summary>
         /// Fires when initial codec sync is completed.  Used to then send commands to get call history, phonebook, bookings, etc.

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs

@@ -277,25 +277,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SoftwareID SoftwareID { get; set; }
         }
 
-        public class Availability : ValueProperty
+        public class Availability
         {
-            string _Value;
-            public bool BoolValue { get; private set; }
-
-            public string Value
-            {
-                get
-                {
-                    return _Value;
-                }
-                set
-                {
-                    // If the incoming value is "Available" it sets the BoolValue true, otherwise sets it false
-                    _Value = value;
-                    BoolValue = value == "Available";
-                    OnValueChanged();
-                }
-            }
+            public string Value { get; set; }
         }
 
         public class Status2 : ValueProperty

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -65,8 +65,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		public bool ShowSelfViewByDefault { get; protected set; }
 
-        public bool SupportsCameraOff { get; protected set; }
-        public bool SupportsCameraAutoMode { get; protected set; }
+		protected bool SupportsCameraOff;
+		protected bool SupportsCameraAutoMode;
 
 		public bool IsReady { get; protected set; }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -15,7 +15,6 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Core.Queues;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
@@ -31,12 +30,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private const long MeetingRefreshTimer = 60000;
 		private const uint DefaultMeetingDurationMin = 30;
 		private const string Delimiter = "\x0D\x0A";
-
-        private readonly GenericQueue _receiveQueue;
-        //private readonly CrestronQueue<string> _receiveQueue;
+		private readonly CrestronQueue<string> _receiveQueue;
 
 
-        //private readonly Thread _receiveThread;
+		private readonly Thread _receiveThread;
 
 		private readonly ZoomRoomSyncState _syncState;
 		public bool CommDebuggingIsOn;
@@ -54,7 +51,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			_props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
-            _receiveQueue = new GenericQueue(Key + "-rxQueue", Thread.eThreadPriority.MediumPriority, 512);
+			// The queue that will collect the repsonses in the order they are received
+			_receiveQueue = new CrestronQueue<string>(1024);
+
+			// The thread responsible for dequeuing and processing the messages
+			_receiveThread = new Thread(o => ProcessQueue(), null) { Priority = Thread.eThreadPriority.MediumPriority };
 
 			Communication = comm;
 
@@ -94,10 +95,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				eRoutingSignalType.Audio | eRoutingSignalType.Video,
 				eRoutingPortConnectionType.Hdmi, null, this);
 
-            Output2 = new RoutingOutputPort(RoutingPortNames.AnyVideoOut,
-                eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DisplayPort, null, this);
-
 			SelfviewIsOnFeedback = new BoolFeedback(SelfViewIsOnFeedbackFunc);
 
 			CameraIsOffFeedback = new BoolFeedback(CameraIsOffFeedbackFunc);
@@ -123,7 +120,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			Participants = new CodecParticipants();
 
-			SupportsCameraOff = true;  // Always allow turning off the camera for zoom calls?
+			SupportsCameraOff = _props.SupportsCameraOff;
 			SupportsCameraAutoMode = _props.SupportsCameraAutoMode;
 
 			PhoneOffHookFeedback = new BoolFeedback(PhoneOffHookFeedbackFunc);
@@ -157,18 +154,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			get
 			{
-				return () => 
-                {
-                    var scaledVol = CrestronEnvironment.ScaleWithLimits(Configuration.Audio.Output.Volume, 100, 0, 65535, 0);
-
-                    if (Configuration.Audio.Output.Volume != 0)
-                    {
-                        Debug.Console(2, this, "Storing previous volume level as: {0}, scaled: {1}", Configuration.Audio.Output.Volume, scaledVol);
-                        _previousVolumeLevel = scaledVol; // Store the previous level for recall
-                    }
-
-                    return scaledVol;
-                };
+				return () => CrestronEnvironment.ScaleWithLimits(Configuration.Audio.Output.Volume, 100, 0, 65535, 0);
 			}
 		}
 
@@ -266,7 +252,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public RoutingInputPort CodecOsdIn { get; private set; }
 		public RoutingOutputPort Output1 { get; private set; }
-        public RoutingOutputPort Output2 { get; private set; }
 
 		#region ICommunicationMonitor Members
 
@@ -292,7 +277,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				var handler = CameraSelected;
 				if (handler != null)
 				{
-					handler(this, new CameraSelectedEventArgs(_selectedCamera));
+					handler(this, new CameraSelectedEventArgs(SelectedCamera));
 				}
 			}
 		}
@@ -682,8 +667,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			DirectoryRoot = new CodecDirectory();
 
-            _currentDirectoryResult = DirectoryRoot;
-
 			DirectoryBrowseHistory = new List<CodecDirectory>();
 			DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
 
@@ -700,7 +683,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			// Set up output ports
 			OutputPorts.Add(Output1);
-            OutputPorts.Add(Output2);
 		}
 
 		/// <summary>
@@ -735,16 +717,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
 				"Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
 
-			
-
-			return base.CustomActivate();
-		}
-
-	    #region Overrides of Device
-
-	    public override void Initialize()
-	    {
-	        var socket = Communication as ISocketStatus;
+			var socket = Communication as ISocketStatus;
 			if (socket != null)
 			{
 				socket.ConnectionChange += socket_ConnectionChange;
@@ -755,11 +728,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			Communication.Connect();
 
 			CommunicationMonitor.Start();
-	    }
 
-	    #endregion
+			return base.CustomActivate();
+		}
 
-	    public void SetCommDebug(string s)
+		public void SetCommDebug(string s)
 		{
 			if (s == "1")
 			{
@@ -806,7 +779,37 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			//if (CommDebuggingIsOn)
 			//    Debug.Console(1, this, "Gathered: '{0}'", args.Text);
 
-			_receiveQueue.Enqueue(new ProcessStringMessage(args.Text, ProcessMessage));
+			_receiveQueue.Enqueue(args.Text);
+
+			// If the receive thread has for some reason stopped, this will restart it
+			if (_receiveThread.ThreadState != Thread.eThreadStates.ThreadRunning)
+			{
+				_receiveThread.Start();
+			}
+		}
+
+
+		/// <summary>
+		/// Runs in it's own thread to dequeue messages in the order they were received to be processed
+		/// </summary>
+		/// <returns></returns>
+		private object ProcessQueue()
+		{
+			try
+			{
+				while (true)
+				{
+					var message = _receiveQueue.Dequeue();
+
+					ProcessMessage(message);
+				}
+			}
+			catch (Exception e)
+			{
+				Debug.Console(1, this, "Error Processing Queue: {0}", e);
+			}
+
+			return null;
 		}
 
 
@@ -967,12 +970,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								SendText("echo off");
 								Thread.Sleep(100);
 								// set feedback exclusions
-								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callin_country_list");
+								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callin_country_list");
 								Thread.Sleep(100);
-								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/callout_country_list");
+								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
 								Thread.Sleep(100);
-                                SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/toll_free_callinLlist");
-                                Thread.Sleep(100);
 
 								if (!_props.DisablePhonebookAutoDownload)
 								{
@@ -1564,8 +1565,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					Debug.Console(1, this, "Creating new Status.Call object");
 					Status.Call = new zStatus.Call { Status = callStatus };
 
-                    OnCallStatusChange( new CodecActiveCallItem() { Status = eCodecCallStatus.Disconnected });
-
 					SetUpCallFeedbackActions();
 				}
 
@@ -1586,12 +1585,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								break;
 						}
 
-						var newCall = new CodecActiveCallItem 
-                        {
-                            Name = Status.Call.Info.meeting_list_item.meetingName,
-                            Id = Status.Call.Info.meeting_id,
-                            Status = newStatus 
-                        };
+						var newCall = new CodecActiveCallItem { Status = newStatus };
 
 						ActiveCalls.Add(newCall);
 
@@ -1600,8 +1594,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						OnCallStatusChange(newCall);
 					}
-
-
 				}
 				else
 				{
@@ -1649,8 +1641,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			//clear participants list after call cleanup
 			if (ActiveCalls.Count == 0)
 			{
-                var emptyList = new List<Participant>();
-				Participants.CurrentParticipants = emptyList;
+				Participants.CurrentParticipants = new List<Participant>();
 			}
 		}
 
@@ -1704,12 +1695,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public override void MuteOff()
 		{
-            Debug.Console(2, this, "Unmuting to previous level: {0}", _previousVolumeLevel);
 			SetVolume((ushort)_previousVolumeLevel);
 		}
 
 		public override void MuteOn()
 		{
+			_previousVolumeLevel = Configuration.Audio.Output.Volume; // Store the previous level for recall
 
 			SetVolume(0);
 		}
@@ -2035,16 +2026,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			foreach (var cam in Status.Cameras)
 			{
-                // Known Issue:
-                // Crestron UC engine systems seem to report an item in the cameras list that represnts the USB bridge device. 
-                // If we know the name and it's reliably consistent, we could ignore it here...
-
-                if (cam.Name.IndexOf("HD-CONV-USB") > -1)
-                {
-                    // Skip this as it's the Crestron USB box, not a real camera
-                    continue;
-                }
-
 				var camera = new ZoomRoomCamera(cam.id, cam.Name, this);
 
 				Cameras.Add(camera);
@@ -2476,51 +2457,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public void LocalLayoutToggle()
 		{
-            var currentLayout = LocalLayoutFeedback.StringValue;
-
-            var eCurrentLayout = (int)Enum.Parse(typeof(zConfiguration.eLayoutStyle), currentLayout, true);
-
-            var nextLayout = GetNextLayout(eCurrentLayout);
-
-            if (nextLayout != zConfiguration.eLayoutStyle.None)
-            {
-                SetLayout(nextLayout);
-            }
+			throw new NotImplementedException();
 		}
 
-        /// <summary>
-        /// Tries to get the next available layout
-        /// </summary>
-        /// <param name="currentLayout"></param>
-        /// <returns></returns>
-        private zConfiguration.eLayoutStyle GetNextLayout(int currentLayout)
-        {
-            if (AvailableLayouts == zConfiguration.eLayoutStyle.None)
-            {
-                return zConfiguration.eLayoutStyle.None;
-            }
-
-            zConfiguration.eLayoutStyle nextLayout;
-
-            if (((zConfiguration.eLayoutStyle)currentLayout & zConfiguration.eLayoutStyle.ShareAll) == zConfiguration.eLayoutStyle.ShareAll)
-            {
-                nextLayout = zConfiguration.eLayoutStyle.Gallery;
-            }
-            else
-            {
-                nextLayout = (zConfiguration.eLayoutStyle)(currentLayout << 1);
-            }
-
-            if ((AvailableLayouts & nextLayout) == nextLayout)
-            {
-                return nextLayout;
-            }
-            else
-            {
-                return GetNextLayout((int)nextLayout);
-            }
-        }
-
 		public void LocalLayoutToggleSingleProminent()
 		{
 			throw new NotImplementedException();

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs

@@ -63,8 +63,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             : base(key, name)
         {
             ParentCodec = codec;
-
-            Capabilities = eCameraCapabilities.Pan | eCameraCapabilities.Tilt | eCameraCapabilities.Zoom;
         }
 
         /// <summary>

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.48" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.47" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>