Hotfix branch created to resolve an issue with participant list displaying the zoom room device multiple times when added to call from a waiting room.

.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.  
 

.github/workflows/docker.yml

@@ -8,9 +8,12 @@ on:
       - bugfix/*
       - release/*
       - development
+  pull_request:
+    branches:
+      - development
 
 env:
-  # solution path doesn't need slashes unless it is multiple folders deep
+  # solution path doesn't need slashes unless there it is multiple folders deep
   # solution name does not include extension. .sln is assumed
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials
@@ -87,6 +90,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release
       - name: Upload Release Package
+        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
         id: upload_release
         uses: actions/upload-release-asset@v1
         with:

PepperDashEssentials/ControlSystem.cs

@@ -131,46 +131,29 @@ namespace PepperDash.Essentials
 
                 if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)   // Handles 3-series running Windows CE OS
                 {
-                    string userFolder;
-                    string nvramFolder;
-                    bool is4series = false;
-
-                    if (eCrestronSeries.Series4 == (Global.ProcessorSeries & eCrestronSeries.Series4)) // Handle 4-series
-                    {
-                        is4series = true;
-                        // Set path to user/
-                        userFolder = "user";
-                        nvramFolder = "nvram";
-                    }
-                    else
-                    {
-                        userFolder = "User";
-                        nvramFolder = "Nvram";
-                    }
-
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, is4series ? "4-series" : "3-series");
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on {1} Appliance", Global.AssemblyVersion, Global.ProcessorSeries.ToString());
 
                     // Check if User/ProgramX exists
-                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + userFolder
+                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"{0}/program{1} directory found", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
+                        Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // Check if Nvram/Programx exists
-                    else if (Directory.Exists(directoryPrefix + dirSeparator + nvramFolder
+                    else if (Directory.Exists(directoryPrefix + dirSeparator + "Nvram"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
-                        Debug.Console(0, @"{0}/program{1} directory found", nvramFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + nvramFolder
+                        Debug.Console(0, @"Nvram/program{0} directory found", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "Nvram"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                     // If neither exists, set path to User/ProgramX
                     else
                     {
-                        Debug.Console(0, @"No previous directory found.  Using {0}/program{1}", userFolder, InitialParametersClass.ApplicationNumber);
-                        filePathPrefix = directoryPrefix + dirSeparator + userFolder
+                        Debug.Console(0, @"No previous directory found.  Using User/program{0}", InitialParametersClass.ApplicationNumber);
+                        filePathPrefix = directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber) + dirSeparator;
                     }
                 }
@@ -452,7 +435,7 @@ namespace PepperDash.Essentials
 
             foreach (var roomConfig in ConfigReader.ConfigObject.Rooms)
             {
-                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as IEssentialsRoom;
+                var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
                 if (room != null)
                 {
                     // default IPID
@@ -474,7 +457,7 @@ namespace PepperDash.Essentials
                         }
                     }
 
-                    if (room is IEssentialsHuddleSpaceRoom)
+                    if (room is EssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
@@ -486,12 +469,12 @@ namespace PepperDash.Essentials
 
                         CreateMobileControlBridge(room);
                     }
-                    else if (room is IEssentialsHuddleVtc1Room)
+                    else if (room is EssentialsHuddleVtc1Room)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((IEssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
+                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
@@ -524,22 +507,13 @@ namespace PepperDash.Essentials
 
         }
 
-        private static void CreateMobileControlBridge(object room)
+        private static void CreateMobileControlBridge(EssentialsRoomBase room)
         {
             var mobileControl = GetMobileControlDevice();
 
             if (mobileControl == null) return;
 
-            var mobileControl3 = mobileControl as IMobileControl3;
-
-            if (mobileControl3 != null)
-            {
-                mobileControl3.CreateMobileControlRoomBridge(room as IEssentialsRoom, mobileControl);
-            }
-            else
-            {
-                mobileControl.CreateMobileControlRoomBridge(room as EssentialsRoomBase, mobileControl);
-            }
+            mobileControl.CreateMobileControlRoomBridge(room, mobileControl);
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Mobile Control Bridge Added...");
         }

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -16,7 +16,7 @@ namespace PepperDash.Essentials.Fusion
     {
         BooleanSigData CodecIsInCall;
 
-        public EssentialsHuddleVtc1FusionController(IEssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
             : base(room, ipId, joinMapKey)
         {
 
@@ -37,7 +37,7 @@ namespace PepperDash.Essentials.Fusion
         {
             try
             {
-                var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
                 if (codec == null)
                 {
@@ -141,7 +141,7 @@ namespace PepperDash.Essentials.Fusion
 
         void codec_CallStatusChange(object sender, PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs e)
         {
-            var codec = (Room as IEssentialsHuddleVtc1Room).VideoCodec;
+            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
 
             CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
         }
@@ -174,11 +174,11 @@ namespace PepperDash.Essentials.Fusion
             // Moved to 
             CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(JoinMap.Display1CurrentSourceName.JoinNumber, JoinMap.Display1CurrentSourceName.AttributeName, eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as IEssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
+            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
 
 
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as IEssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
  
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
@@ -187,7 +187,7 @@ namespace PepperDash.Essentials.Fusion
         protected override void SetUpSources()
         {
             // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as IEssentialsHuddleVtc1Room).SourceListKey);
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
             if (dict != null)
             {
                 // NEW PROCESS:
@@ -238,7 +238,7 @@ namespace PepperDash.Essentials.Fusion
             else
             {
                 Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as IEssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
             }
         }
 
@@ -259,7 +259,7 @@ namespace PepperDash.Essentials.Fusion
                     display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
                 }
 
-                var defaultDisplay = (Room as IEssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -332,7 +332,7 @@ namespace PepperDash.Essentials.Fusion
             string displayName = string.Format("Display {0} - ", displayIndex);
 
 
-            if (display == (Room as IEssentialsHuddleVtc1Room).DefaultDisplay)
+            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
             {
                 // Power on
                 var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
@@ -351,7 +351,7 @@ namespace PepperDash.Essentials.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IEssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
         }
     }

PepperDashEssentials/PepperDashEssentials.csproj

@@ -149,7 +149,6 @@
     <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
     <Compile Include="Room\Types\EssentialsTechRoom.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/Config/EssentialsRoomConfig.cs

@@ -47,7 +47,7 @@ namespace PepperDash.Essentials.Room.Config
         /// Gets and operating, standalone emergegncy object that can be plugged into a room.
         /// Returns null if there is no emergency defined
         /// </summary>
-        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, IEssentialsRoom room)
+        public static EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, EssentialsRoomBase room)
         {
             // This emergency 
             var emergency = props.Emergency;
@@ -96,7 +96,7 @@ namespace PepperDash.Essentials.Room.Config
 			if (behaviour == "trackroomstate")
 			{
 				// Tie LED enable to room power state
-                var essRoom = room as IEssentialsRoom;
+                var essRoom = room as EssentialsRoomBase;
                 essRoom.OnFeedback.OutputChange += (o, a) =>
 				{
                     if (essRoom.OnFeedback.BoolValue)

PepperDashEssentials/Room/Emergency/EsentialsRoomEmergencyContactClosure.cs

@@ -17,11 +17,11 @@ namespace PepperDash.Essentials.Room
 
     public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase
     {
-        IEssentialsRoom Room;
+        EssentialsRoomBase Room;
         string Behavior;
         bool TriggerOnClose;
 
-        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, IEssentialsRoom room) :
+        public EssentialsRoomEmergencyContactClosure(string key, EssentialsRoomEmergencyConfig config, EssentialsRoomBase room) :
             base(key)
         {
             Room = room;

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -207,7 +207,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -215,7 +215,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
         {
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;
@@ -645,9 +645,9 @@ namespace PepperDash.Essentials
         public static void AllRoomsOff()
         {
             var allRooms = DeviceManager.AllDevices.Where(d =>
-                d is IEssentialsHuddleSpaceRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+                d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
             foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as IEssentialsHuddleSpaceRoom).SourceListKey);
+                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as EssentialsHuddleSpaceRoom).SourceListKey);
         }
 
         #region IPrivacy Members

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -13,7 +13,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IEssentialsHuddleSpaceRoom
+    public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay
 	{
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
 		public event SourceInfoChangeHandler CurrentSourceChange;
@@ -156,7 +156,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IRoutingSinkWithSwitching;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -164,7 +164,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void InitializeRoom()
+		void Initialize()
 		{
             if (DefaultAudioDevice is IBasicVolumeControls)
                 DefaultVolumeControls = DefaultAudioDevice as IBasicVolumeControls;

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -17,7 +17,8 @@ using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials
 {
-    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IEssentialsHuddleVtc1Room
+    public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
+        IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
     {
         private bool _codecExternalSourceChange;
 		public event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
@@ -226,7 +227,7 @@ namespace PepperDash.Essentials
 
                 DefaultAudioDevice = DeviceManager.GetDeviceForKey(PropertiesConfig.DefaultAudioKey) as IBasicVolumeControls;
 
-                InitializeRoom();
+                Initialize();
             }
             catch (Exception e)
             {
@@ -234,7 +235,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void InitializeRoom()
+        void Initialize()
 		{
             try
             {
@@ -454,8 +455,7 @@ namespace PepperDash.Essentials
             else
             {
                 Debug.Console(1, this, "sourceListKey present but not yet implemented");
-
-                RunRouteAction(routeKey, new Action(() => { }));
+                throw new NotImplementedException();
             }
         }
 
@@ -472,11 +472,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>
@@ -738,9 +734,9 @@ namespace PepperDash.Essentials
 		public static void AllRoomsOff()
 		{
 			var allRooms = DeviceManager.AllDevices.Where(d => 
-                d is IEssentialsRoom && !(d as IEssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
+				d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
 			foreach (var room in allRooms)
-                (room as IEssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
+				(room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
 		}
 
 

PepperDashEssentials/Room/Types/IEssentialsHuddleSpaceRoom.cs

@@ -1,44 +0,0 @@
-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, IHasDefaultDisplay
-    {
-        bool ExcludeFromGlobalFunctions { get; }
-
-        void RunRouteAction(string routeKey);
-
-        EssentialsHuddleRoomPropertiesConfig PropertiesConfig { get; }
-
-        IBasicVolumeControls CurrentVolumeControls { get; }
-
-        event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-    }
-
-    public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-        IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay
-    {
-        EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
-
-        void RunRouteAction(string routeKey);
-
-        IHasScheduleAwareness ScheduleSource { 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)
@@ -232,7 +222,7 @@ namespace PepperDash.Essentials
 
                 // spin up different room drivers depending on room type
                 var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
-                if (room is IEssentialsHuddleSpaceRoom)
+                if (room is EssentialsHuddleSpaceRoom)
                 {
                     // Screen Saver Driver
                     mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
@@ -246,7 +236,7 @@ namespace PepperDash.Essentials
                     var avDriver = new EssentialsHuddlePanelAvFunctionsDriver(mainDriver, props);
                     avDriver.DefaultRoomKey = props.DefaultRoomKey;
                     mainDriver.AvDriver = avDriver;
-                    avDriver.CurrentRoom = room as IEssentialsHuddleSpaceRoom;
+                    avDriver.CurrentRoom = room as EssentialsHuddleSpaceRoom;
 
                     // Environment Driver
                     if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)
@@ -280,7 +270,7 @@ namespace PepperDash.Essentials
                         tsw.Down.UserObject = new Action<bool>(avDriver.VolumeDownPress);
                     }
                 }
-                else if (room is IEssentialsHuddleVtc1Room)
+                else if (room is EssentialsHuddleVtc1Room)
                 {
                     Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
 
@@ -294,11 +284,11 @@ namespace PepperDash.Essentials
                     var avDriver = new EssentialsHuddleVtc1PanelAvFunctionsDriver(mainDriver, props);
 
                     var codecDriver = new PepperDash.Essentials.UIDrivers.VC.EssentialsVideoCodecUiDriver(panelController.Panel, avDriver,
-                        (room as IEssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
+                        (room as EssentialsHuddleVtc1Room).VideoCodec, mainDriver.HeaderDriver);
                     avDriver.SetVideoCodecDriver(codecDriver);
                     avDriver.DefaultRoomKey = props.DefaultRoomKey;
                     mainDriver.AvDriver = avDriver;
-                    avDriver.CurrentRoom = room as IEssentialsHuddleVtc1Room;
+                    avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room;
 
                     // Environment Driver
                     if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)

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
@@ -752,10 +743,10 @@ namespace PepperDash.Essentials
         /// 15044 Close button for source modal overlay
         /// </summary>
         public const uint SourceBackgroundOverlayClosePress = 15044;
-        ///// <summary>
-        ///// 15045 - Visibility for the bar containing call navigation button list
-        ///// </summary>
-        //public const uint CallStagingBarVisible = 15045;
+        /// <summary>
+        /// 15045 - Visibility for the bar containing call navigation button list
+        /// </summary>
+        public const uint CallStagingBarVisible = 15045;
 		/// <summary>
 		/// 15046
 		/// </summary>
@@ -773,10 +764,6 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public const uint NextMeetingModalVisible = 15049;
         /// <summary>
-        /// 15050
-        /// </summary>
-        public const uint NextMeetingNotificationRibbonVisible = 15050;
-        /// <summary>
         /// 15051
         /// </summary>
         public const uint Display1SelectPressAndFb = 15051;

PepperDashEssentials/UIDrivers/DualDisplayRouting.cs

@@ -146,18 +146,18 @@
 
 //        }
 
-//        void CurrentRoom_CurrentSourceInfoChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
             
 //        }
 
-//        void CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display1SourceLabel].StringValue = PendingSource.PreferredName;
 
 //        }
 
-//        void CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            TriList.StringInput[UIStringJoin.Display2SourceLabel].StringValue = PendingSource.PreferredName;
 //        }

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -52,7 +52,7 @@ namespace PepperDash.Essentials
             CaretInterlock = new JoinedSigInterlock(TriList);
         }
 
-        void SetUpGear(IAVDriver avDriver, IEssentialsRoom currentRoom)
+        void SetUpGear(IAVDriver avDriver, EssentialsRoomBase currentRoom)
         {
             // Gear
             TriList.SetString(UIStringJoin.HeaderButtonIcon5, "Gear");
@@ -105,7 +105,7 @@ namespace PepperDash.Essentials
             {
                 string message = null;
                 var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
-                    as IEssentialsHuddleSpaceRoom;
+                    as EssentialsHuddleSpaceRoom;
                 if (room != null)
                     message = room.PropertiesConfig.HelpMessage;
                 else
@@ -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)
@@ -222,7 +221,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleVtc1Room type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, IEssentialsHuddleVtc1Room currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddleVtc1PanelAvFunctionsDriver avDriver, EssentialsHuddleVtc1Room currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 
@@ -284,7 +283,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Sets up Header Buttons for the EssentialsHuddleSpaceRoom type
         /// </summary>
-        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, IEssentialsHuddleSpaceRoom currentRoom)
+        public void SetupHeaderButtons(EssentialsHuddlePanelAvFunctionsDriver avDriver, EssentialsHuddleSpaceRoom currentRoom)
         {
             HeaderButtonsAreSetUp = false;
 

PepperDashEssentials/UIDrivers/Essentials/EssentialsPresentationPanelAvFunctionsDriver.cs

@@ -983,7 +983,7 @@
 //        /// <summary>
 //        /// Handles source change
 //        /// </summary>
-//        void _CurrentRoom_SourceInfoChange(IEssentialsRoom room, 
+//        void _CurrentRoom_SourceInfoChange(EssentialsRoomBase room, 
 //            SourceListItem info, ChangeType change)
 //        {
 //            if (change == ChangeType.WillChange)
@@ -995,7 +995,7 @@
 //        /// <summary>
 //        /// 
 //        /// </summary>
-//        void _CurrentRoom_CurrentDisplay1SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void _CurrentRoom_CurrentDisplay1SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            if (type == ChangeType.DidChange)
 //            {
@@ -1021,7 +1021,7 @@
 //        /// <summary>
 //        /// 
 //        /// </summary>
-//        void _CurrentRoom_CurrentDisplay2SourceChange(IEssentialsRoom room, SourceListItem info, ChangeType type)
+//        void _CurrentRoom_CurrentDisplay2SourceChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
 //        {
 //            if (type == ChangeType.DidChange)
 //            {

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -78,7 +78,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// 
 		/// </summary>
-		public IEssentialsHuddleSpaceRoom CurrentRoom
+		public EssentialsHuddleSpaceRoom CurrentRoom
 		{
 			get { return _CurrentRoom; }
 			set
@@ -86,7 +86,7 @@ namespace PepperDash.Essentials
 				SetCurrentRoom(value);
 			}
 		}
-		IEssentialsHuddleSpaceRoom _CurrentRoom;
+		EssentialsHuddleSpaceRoom _CurrentRoom;
 
         /// <summary>
         /// 
@@ -498,7 +498,7 @@ namespace PepperDash.Essentials
             TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
             // Run default source when room is off and share is pressed
             if (!CurrentRoom.OnFeedback.BoolValue)
-                (CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute();
+                CurrentRoom.RunDefaultPresentRoute();
         }
 
 
@@ -583,7 +583,7 @@ namespace PepperDash.Essentials
 		void UiSelectSource(string key)
 		{
 			// Run the route and when it calls back, show the source
-			CurrentRoom.RunRouteAction(key);
+			CurrentRoom.RunRouteAction(key, new Action(() => { }));
 		}
 
 		/// <summary>
@@ -745,7 +745,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        public void RefreshCurrentRoom(IEssentialsHuddleSpaceRoom room)
+        public void RefreshCurrentRoom(EssentialsHuddleSpaceRoom room)
         {
             if (_CurrentRoom != null)
             {
@@ -836,7 +836,7 @@ namespace PepperDash.Essentials
             }
         }
 
-		void SetCurrentRoom(IEssentialsHuddleSpaceRoom room)
+		void SetCurrentRoom(EssentialsHuddleSpaceRoom room)
 		{
 			if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -871,7 +871,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(IEssentialsHuddleSpaceRoom room)
+        void UpdateMCJoins(EssentialsHuddleSpaceRoom room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -918,7 +918,6 @@ namespace PepperDash.Essentials
                 TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
-                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
             }
         }
 

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddleTechPageDriver.cs

@@ -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

@@ -50,7 +50,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 
         /// </summary>
-        public IEssentialsHuddleVtc1Room CurrentRoom
+        public EssentialsHuddleVtc1Room CurrentRoom
         {
             get { return _CurrentRoom; }
             set
@@ -58,7 +58,7 @@ namespace PepperDash.Essentials
                 SetCurrentRoom(value);
             }
         }
-        IEssentialsHuddleVtc1Room _CurrentRoom;
+        EssentialsHuddleVtc1Room _CurrentRoom;
 
         /// <summary>
         /// For hitting feedbacks
@@ -173,28 +173,10 @@ namespace PepperDash.Essentials
         /// </summary>
         public PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; private set; }
 
-
-        private UiDisplayMode _currentMode;
-
         /// <summary>
         /// The mode showing. Presentation or call.
         /// </summary>
-        UiDisplayMode CurrentMode
-        {
-            get
-            {
-                return _currentMode;
-            }
-            set
-            {
-                if (value != _currentMode)
-                {
-                    _currentMode = value;
-
-                    SetActivityFooterFeedbacks();
-                }
-            }
-        }
+        UiDisplayMode CurrentMode = UiDisplayMode.Start;
 
 		CTimer NextMeetingTimer;
 
@@ -225,7 +207,6 @@ namespace PepperDash.Essentials
 
 			MeetingOrContactMethodModalSrl = new SubpageReferenceList(TriList, UISmartObjectJoin.MeetingListSRL, 3, 3, 5);
 
-            CurrentMode = UiDisplayMode.Start;
 
 			// buttons are added in SetCurrentRoom
 			//HeaderButtonsList = new SmartObjectHeaderButtonList(TriList.SmartObjects[UISmartObjectJoin.HeaderButtonList]);
@@ -626,25 +607,12 @@ namespace PepperDash.Essentials
         /// </summary>
         void SetActivityFooterFeedbacks()
         {
-            if (CurrentRoom != null)
-            {
-                var startMode = CurrentMode == UiDisplayMode.Start;
-                var presentationMode = CurrentMode == UiDisplayMode.Presentation;
-                var callMode = CurrentMode == UiDisplayMode.Call;
-
-                TriList.SetBool(StartPageVisibleJoin, startMode ? true : false);
-
-                TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, presentationMode ? true : false);
-                if (!presentationMode)
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-
-                CallButtonSig.BoolValue = callMode
+            CallButtonSig.BoolValue = CurrentMode == UiDisplayMode.Call 
                 && CurrentRoom.ShutdownType == eShutdownType.None;
-                ShareButtonSig.BoolValue = presentationMode
+            ShareButtonSig.BoolValue = CurrentMode == UiDisplayMode.Presentation 
                 && CurrentRoom.ShutdownType == eShutdownType.None;
             EndMeetingButtonSig.BoolValue = CurrentRoom.ShutdownType != eShutdownType.None;
         }
-        }
 
         /// <summary>
         /// 
@@ -655,13 +623,14 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            //TriList.SetBool(StartPageVisibleJoin, false);
-            //TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
-            //TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
                 CurrentSourcePageManager.Hide();
 			PowerOnFromCall();
             CurrentMode = UiDisplayMode.Call;
+            SetActivityFooterFeedbacks();
             VCDriver.Show();
         }
 
@@ -674,25 +643,29 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
+            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
+            TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
             // Run default source when room is off and share is pressed
+            if (!CurrentRoom.OnFeedback.BoolValue)
+            { 
 				if (!CurrentRoom.OnFeedback.BoolValue)
 				{
 					// If there's no default, show UI elements
-				if (!(CurrentRoom as IRunDefaultPresentRoute).RunDefaultPresentRoute())
+					if (!CurrentRoom.RunDefaultPresentRoute())
 						TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
 				}
+            }
             else // room is on show what's active or select a source if nothing is yet active
             {
-                if(CurrentRoom.CurrentSourceInfo == null || (CurrentRoom.VideoCodec != null && CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
+                if(CurrentRoom.CurrentSourceInfo == null || CurrentRoom.CurrentSourceInfoKey == CurrentRoom.DefaultCodecRouteString)
                     TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
                 else if (CurrentSourcePageManager != null)
-                {
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
                     CurrentSourcePageManager.Show();
             }
-            }
             CurrentMode = UiDisplayMode.Presentation;
 			SetupSourceList();
+            SetActivityFooterFeedbacks();
         }
 
 		/// <summary>
@@ -734,8 +707,6 @@ namespace PepperDash.Essentials
 			if (CurrentRoom.CurrentSourceInfo == null)
 				return;
 
-            CurrentMode = UiDisplayMode.Presentation;
-
 			if (CurrentRoom.CurrentSourceInfo.SourceDevice == null)
 			{
 				TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
@@ -772,7 +743,7 @@ namespace PepperDash.Essentials
         void UiSelectSource(string key)
         {
             // Run the route and when it calls back, show the source
-            CurrentRoom.RunRouteAction(key);
+            CurrentRoom.RunRouteAction(key, new Action(() => { }));
         }
 
         /// <summary>
@@ -923,7 +894,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Helper for property setter. Sets the panel to the given room, latching up all functionality
         /// </summary>
-        void RefreshCurrentRoom(IEssentialsHuddleVtc1Room room)
+        void RefreshCurrentRoom(EssentialsHuddleVtc1Room room)
         {
 
             if (_CurrentRoom != null)
@@ -998,7 +969,7 @@ namespace PepperDash.Essentials
             }
         }
 
-        void SetCurrentRoom(IEssentialsHuddleVtc1Room room)
+        void SetCurrentRoom(EssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
@@ -1033,7 +1004,7 @@ namespace PepperDash.Essentials
             UpdateMCJoins(_CurrentRoom);
         }
 
-        void UpdateMCJoins(IEssentialsHuddleVtc1Room room)
+        void UpdateMCJoins(EssentialsHuddleVtc1Room room)
         {
             TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
             TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
@@ -1064,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);
 				}
 			}
 
@@ -1134,30 +1105,6 @@ namespace PepperDash.Essentials
         /// <param name="type"></param>
         void CurrentRoom_CurrentSingleSourceChange(SourceListItem info, ChangeType type)
         {
-            Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange");
-
-            // Show the Select a source subpage 
-            if (TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue)
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange SourceStagingBarVisisble: true");
-
-                if (_CurrentRoom.CurrentSourceInfo == null || (_CurrentRoom.VideoCodec != null && _CurrentRoom.CurrentSourceInfo.SourceDevice.Key == _CurrentRoom.VideoCodec.OsdSource.Key))
-                {
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Showing SelectASourceVisible");
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
-                }
-                else
-                {
-                    TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-                    Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                }
-            }
-            else
-            {
-                Debug.Console(1, "AvFunctionsDriver: CurrentSingleSourceChange Hiding SelectASourceVisible");
-                TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
-            }
-
             if (_CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && _CurrentRoom.CurrentSourceInfo != null)
                 TriList.StringInput[UIStringJoin.CallSharedSourceNameText].StringValue = _CurrentRoom.CurrentSourceInfo.PreferredName;
         }
@@ -1255,12 +1202,12 @@ namespace PepperDash.Essentials
             var value = _CurrentRoom.OnFeedback.BoolValue;
             TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value;
 
-            //TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
+            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
 
             if (value) //ON
             {
                 SetupActivityFooterWhenRoomOn();
-                //TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = true;
 
             }
@@ -1271,8 +1218,9 @@ namespace PepperDash.Essentials
                     VCDriver.Hide();
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                //TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
-                //TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
+                SetActivityFooterFeedbacks();
+                TriList.BooleanInput[UIBoolJoin.VolumeDualMute1Visible].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
 				// Clear this so that the pesky meeting warning can resurface every minute when off
 				LastMeetingDismissedId = null;
             }
@@ -1495,7 +1443,7 @@ namespace PepperDash.Essentials
     /// </summary>
     public interface IAVWithVCDriver : IAVDriver
     {
-        IEssentialsHuddleVtc1Room CurrentRoom { get; }
+        EssentialsHuddleVtc1Room CurrentRoom { get; }
 
         PepperDash.Essentials.Core.Touchpanels.Keyboards.HabaneroKeyboardController Keyboard { get; }
         /// <summary>

PepperDashEssentials/UIDrivers/SmartObjectRoomsList.cs

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials
 		/// <summary>
 		/// Sets feedback for the given room
 		/// </summary>
-		public void SetFeedbackForRoom(IEssentialsHuddleSpaceRoom room)
+		public void SetFeedbackForRoom(EssentialsHuddleSpaceRoom room)
 		{
 			var itemToSet = Items.FirstOrDefault(i => i.Room == room);
 			if (itemToSet != null)
@@ -48,11 +48,11 @@ namespace PepperDash.Essentials
 
 	public class SmartObjectRoomsListItem
 	{
-		public IEssentialsHuddleSpaceRoom Room { get; private set; }
+		public EssentialsHuddleSpaceRoom Room { get; private set; }
 		SmartObjectRoomsList Parent;
 		public uint Index { get; private set; }
 
-		public SmartObjectRoomsListItem(IEssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
+		public SmartObjectRoomsListItem(EssentialsHuddleSpaceRoom room, uint index, SmartObjectRoomsList parent, 
 			Action<bool> buttonAction)
 		{
 			Room = room;

PepperDashEssentials/UIDrivers/SourceChangeArgs.cs

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

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);
@@ -357,12 +354,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 			if (Codec.IsInCall)
 				stageJoin = UIBoolJoin.VCStagingActivePopoverVisible;
 			else
-            {
-                if (Codec is IHasCallHistory)
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithRecentsVisible;
-                else
-                    stageJoin = UIBoolJoin.VCStagingInactivePopoverWithoutRecentsVisible;
-            }
+				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)
                 {
@@ -1041,20 +1005,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		void SetupDirectoryList()
 		{
 			var codec = Codec as IHasDirectory;
-		    if (codec == null)
+			if (codec != null)
 			{
-		        return;
-		    }
-
 				DirectoryList = new SmartObjectDynamicList(TriList.SmartObjects[UISmartObjectJoin.VCDirectoryList],
 					true, 1300);
-		    codec.DirectoryResultReturned += dir_DirectoryResultReturned;
+				codec.DirectoryResultReturned += new EventHandler<DirectoryEventArgs>(dir_DirectoryResultReturned);
 
 				if (codec.PhonebookSyncState.InitialSyncComplete)
 					SetCurrentDirectoryToRoot();
 				else
 				{
-		        codec.PhonebookSyncState.InitialSyncCompleted += PhonebookSyncState_InitialSyncCompleted;
+					codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler<EventArgs>(PhonebookSyncState_InitialSyncCompleted);
+				}
+
+			    RefreshDirectory();
+				
 			}
 		}
 
@@ -1063,15 +1028,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SetCurrentDirectoryToRoot()
         {
-            var hasDirectory = Codec as IHasDirectory;
+            (Codec as IHasDirectory).SetCurrentDirectoryToRoot();
 
-            if (hasDirectory == null)
-            {
-                return;
-            }
-
-            hasDirectory.SetCurrentDirectoryToRoot();
             SearchKeypadClear();
+
+            RefreshDirectory();
         }
 
         /// <summary>
@@ -1083,17 +1044,10 @@ namespace PepperDash.Essentials.UIDrivers.VC
         {
             var codec = Codec as IHasDirectory;
 
-            if (codec == null)
-            {
-                return;
-            }
-
-            if (!codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-            {
-                return;
-            }
-
             SetCurrentDirectoryToRoot();
+
+            RefreshDirectory();
+            
         }
 
 		/// <summary>
@@ -1103,7 +1057,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <param name="e"></param>
 		void dir_DirectoryResultReturned(object sender, DirectoryEventArgs e)
 		{
-		    RefreshDirectory(e.Directory);
+
+			RefreshDirectory();
 		}
 
         /// <summary>
@@ -1135,24 +1090,13 @@ namespace PepperDash.Essentials.UIDrivers.VC
 		/// <summary>
 		/// 
 		/// </summary>
+		/// <param name="dir"></param>
 		void RefreshDirectory()
 		{
-		    var codec = Codec as IHasDirectory;
-
-		    if (codec == null)
-		    {
-		        return;
-		    }
-
-		    RefreshDirectory(codec.CurrentDirectoryResult);
-		}
-
-        void RefreshDirectory(CodecDirectory directory)
-        {
-            if (directory.CurrentDirectoryResults.Count > 0)
+            if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0)
             {
                 ushort i = 0;
-                foreach (var r in directory.CurrentDirectoryResults)
+                foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults)
                 {
                     if (i == DirectoryList.MaxCount)
                     {
@@ -1172,35 +1116,21 @@ namespace PepperDash.Essentials.UIDrivers.VC
                             // If more than one contact method, show contact method modal dialog
                             DirectoryList.SetItemButtonAction(i, b =>
                             {
-                                if (b)
+                                if (!b)
                                 {
-                                    return;
-                                }
                                     // Refresh the contact methods list
                                     RefreshContactMethodsModalList(dc);
                                     Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+                                }
                             });
 
                         }
-                        else if (dc.ContactMethods.Count == 1)
-                        {
-                            var invitableContact = dc as IInvitableContact;
-
-                            if (invitableContact != null)
-                            {
-                                DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(invitableContact); });
-                            }
                         else
                         {
                             // If only one contact method, just dial that method
 							DirectoryList.SetItemButtonAction(i, b => { if (!b) Codec.Dial(dc.ContactMethods[0].Number); });
                         }
                     }
-                        else
-                        {
-                            Debug.Console(1, "Unable to dial contact.  No availble ContactMethod(s) specified");
-                        }
-                    }
                     else    // is DirectoryFolder
                     {
                         DirectoryList.SetItemMainText(i, string.Format("[+] {0}", r.Name));
@@ -1225,6 +1155,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 DirectoryList.SetItemMainText(1, "No Results Found");
             }
+
 		}
 
         void RefreshContactMethodsModalList(DirectoryContact contact)
@@ -1270,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) => 
 				{
@@ -1283,7 +1214,6 @@ 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;
@@ -1291,16 +1221,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					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/Bridges/BridgeBase.cs

@@ -385,7 +385,7 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -403,16 +403,6 @@ namespace PepperDash.Essentials.Core.Bridges
                         controlProperties.TcpSshProperties.Address, Global.ControlSystem);
                     return new EiscApiAdvanced(dc, eisc);
                 }
-                case "eiscapiadvancedserver":
-                {
-                    var eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                    return new EiscApiAdvanced(dc, eisc);
-                }
-                case "eiscapiadvancedclient":
-                {
-                    var eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                    return new EiscApiAdvanced(dc, eisc);
-                }
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
                 {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/C2nIo/C2nIoController.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.GeneralIO;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.CrestronIO
-{
-    public class C2NIoController:CrestronGenericBaseDevice, IComPorts, IIROutputPorts, IRelayPorts
-    {
-        private C2nIo _device;
-
-        public C2NIoController(string key, Func<DeviceConfig, C2nIo> preActivationFunc, DeviceConfig config):base(key, config.Name)
-        {
-            AddPreActivationAction(() =>
-            {
-                _device = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(_device);
-            });
-        }
-
-        #region Implementation of IComPorts
-
-        public CrestronCollection<ComPort> ComPorts
-        {
-            get { return _device.ComPorts; }
-        }
-
-        public int NumberOfComPorts
-        {
-            get { return _device.NumberOfComPorts; }
-        }
-
-        #endregion
-
-        #region Implementation of IIROutputPorts
-
-        public CrestronCollection<IROutputPort> IROutputPorts
-        {
-            get { return _device.IROutputPorts; }
-        }
-
-        public int NumberOfIROutputPorts
-        {
-            get { return _device.NumberOfIROutputPorts; }
-        }
-
-        #endregion
-
-        #region Implementation of IRelayPorts
-
-        public CrestronCollection<Relay> RelayPorts
-        {
-            get { return _device.RelayPorts; }
-        }
-
-        public int NumberOfRelayPorts
-        {
-            get { return _device.NumberOfRelayPorts; }
-        }
-
-        #endregion
-    }
-
-    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2nRthsController>
-    {
-        public C2NIoControllerFactory()
-        {
-            TypeNames = new List<string>() { "c2nio" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new C2N-IO Device");
-
-            return new C2NIoController(dc.Key, GetC2NIoDevice, dc);
-        }
-
-        static C2nIo GetC2NIoDevice(DeviceConfig dc)
-        {
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var cresnetId = control.CresnetIdInt;
-            var branchId = control.ControlPortNumber;
-            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
-
-            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
-                return new C2nIo(cresnetId, Global.ControlSystem);
-            }
-            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
-
-            if (cresnetBridge != null)
-            {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new C2nIo", parentKey);
-                return new C2nIo(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-    }
-}

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

@@ -13,14 +13,6 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         void LinkSystemMonitorToAppServer();
     }
 
-    /// <summary>
-    /// Describes a MobileSystemController that accepts IEssentialsRoom
-    /// </summary>
-    public interface IMobileControl3 : IMobileControl
-    {
-        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
-    }
-
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>

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

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the functionality required to prompt a user to enter a password
-    /// </summary>
-    public interface IPasswordPrompt
-    {
-        /// <summary>
-        /// Notifies when a password is required or is entered incorrectly
-        /// </summary>
-        event EventHandler<PasswordPromptEventArgs> PasswordRequired;
-
-        /// <summary>
-        /// Submits the password
-        /// </summary>
-        /// <param name="password"></param>
-        void SubmitPassword(string password);
-    }
-
-    public class PasswordPromptEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Indicates if the last submitted password was incorrect
-        /// </summary>
-        public bool LastAttemptWasIncorrect { get; private set; }
-
-        /// <summary>
-        /// Indicates that the login attempt has failed
-        /// </summary>
-        public bool LoginAttemptFailed { get; private set; }
-
-        /// <summary>
-        /// Indicates that the process was cancelled and the prompt should be dismissed
-        /// </summary>
-        public bool LoginAttemptCancelled { get; private set; }
-
-        /// <summary>
-        /// A message to be displayed to the user
-        /// </summary>
-        public string Message { get; private set; }
-
-        public PasswordPromptEventArgs(bool lastAttemptIncorrect, bool loginFailed, bool loginCancelled, string message)
-        {
-            LastAttemptWasIncorrect = lastAttemptIncorrect;
-            LoginAttemptFailed = loginFailed;
-            LoginAttemptCancelled = loginCancelled;
-            Message = message;
-        }
-    }
-}

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

@@ -77,9 +77,10 @@ namespace PepperDash.Essentials.Core
                 var mParams = method.GetParameters();
 
                 var convertedParams = mParams
-                                    .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
+                                    .Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
+                                        System.Globalization.CultureInfo.InvariantCulture))
                                     .ToArray();
-                method.Invoke(obj, convertedParams);
+                var ret = method.Invoke(obj, convertedParams);
 
 		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
 		            action.DeviceKey);
@@ -90,23 +91,6 @@ namespace PepperDash.Essentials.Core
 		            ex.Message);}
 		}
 
-	    private static object ConvertType(object value, Type conversionType)
-	    {
-	        if (!conversionType.IsEnum)
-	        {
-	            return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
-	        }
-
-	        var stringValue = Convert.ToString(value);
-
-	        if (String.IsNullOrEmpty(stringValue))
-	        {
-	            throw new InvalidCastException(
-	                String.Format("{0} cannot be converted to a string prior to conversion to enum"));
-	        }
-	        return Enum.Parse(conversionType, stringValue, true);
-	    }
-
 		/// <summary>
 		/// Gets the properties on a device
 		/// </summary>
@@ -291,8 +275,6 @@ namespace PepperDash.Essentials.Core
             //var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
             //return JsonConvert.SerializeObject(props, Formatting.Indented);
         }
-
-        
 	}
 
 	public class DeviceActionWrapper

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

@@ -435,7 +435,7 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)

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

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Core.Devices
-{
-    public interface IReconfigurableDevice
-    {
-        event EventHandler<EventArgs> ConfigChanged;
-
-        DeviceConfig Config { get; }
-
-        void SetConfig(DeviceConfig config);
-    }
-}

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

@@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Core.Devices
     /// <summary>
     /// 
     /// </summary>
-    public abstract class ReconfigurableDevice : EssentialsDevice, IReconfigurableDevice
+    public abstract class ReconfigurableDevice : EssentialsDevice
     {
         public event EventHandler<EventArgs> ConfigChanged;
 

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

@@ -59,9 +59,6 @@ namespace PepperDash.Essentials.Core
 
 			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
 			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
-
-            WarmupTime = 10000;
-            CooldownTime = 5000;
 		}
 
 		public override void PowerOn()

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

@@ -156,15 +156,6 @@ 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;
             }
         }

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,8 +40,11 @@ namespace PepperDash.Essentials.Core
 
 		public void AddOutputsIn(List<BoolFeedback> outputs)
 		{
-		    foreach (var o in outputs.Where(o => !OutputsIn.Contains(o)))
+			foreach (var o in outputs)
 			{
+				// skip existing
+				if (OutputsIn.Contains(o)) continue;
+			
 				OutputsIn.Add(o);
 				o.OutputChange += AnyInput_OutputChange;
 			}
@@ -51,7 +54,7 @@ namespace PepperDash.Essentials.Core
 		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,14 +85,13 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.All(o => o.BoolValue);
-		    if (newValue == prevValue)
+			if (newValue != prevValue)
 			{
-		        return;
-		    }
 				ComputedValue = newValue;
 				Output.FireUpdate();
 			}
 		}
+	}
 
 	public class BoolFeedbackOr : BoolFeedbackLogic
 	{
@@ -103,35 +99,33 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.Any(o => o.BoolValue);
-		    if (newValue == prevValue)
+			if (newValue != prevValue)
 			{
-		        return;
-		    }
 				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)
+			var newValue = Predicate(OutputsIn);
+			if (newValue != prevValue)
 			{
-		        return;
-		    }
 				ComputedValue = newValue;
 				Output.FireUpdate();
 			}
 		} 
+	}
 }

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

@@ -33,7 +33,7 @@ namespace PepperDash.Essentials.Core.Fusion
         protected FusionRoom FusionRoom;
         protected Dictionary<int, FusionAsset> FusionStaticAssets;
         public long PushNotificationTimeout = 5000;
-        protected IEssentialsRoom Room;
+        protected EssentialsRoomBase Room;
         public long SchedulePollInterval = 300000;
 
         private Event _currentMeeting;
@@ -86,7 +86,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
         #endregion
 
-        public EssentialsHuddleSpaceFusionSystemControllerBase(IEssentialsRoom room, uint ipId, string joinMapKey)
+        public EssentialsHuddleSpaceFusionSystemControllerBase(EssentialsRoomBase room, uint ipId, string joinMapKey)
             : base(room.Key + "-fusion")
         {
             try

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

@@ -82,7 +82,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
                         deviceConfig.Properties = JToken.FromObject(devProps);
                     }
-                    else if (device is IEssentialsRoom)
+                    else if (device is EssentialsRoomBase)
                     {
                         // Set the room name
                         if (!string.IsNullOrEmpty(roomInfo.Name))

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

@@ -3,17 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.GeneralIO;
+
 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();
-        }
-    }
-
-    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);
+            AggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
         }
     }
 }

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/PepperDash_Essentials_Core.csproj

@@ -162,7 +162,6 @@
     <Compile Include="Config\Essentials\ConfigWriter.cs" />
     <Compile Include="Config\Essentials\EssentialsConfig.cs" />
     <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
-    <Compile Include="Crestron IO\C2nIo\C2nIoController.cs" />
     <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
     <Compile Include="Crestron IO\Cards\C3CardControllerBase.cs" />
     <Compile Include="Crestron IO\Cards\C3Com3Controller.cs" />
@@ -198,12 +197,10 @@
     <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IDspPreset.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
-    <Compile Include="Devices\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
     <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
@@ -235,7 +232,6 @@
     <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
     <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Occupancy\GlsOirOccupancySensorController.cs" />
-    <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
@@ -292,7 +288,6 @@
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
     <Compile Include="Room\EssentialsRoomBase.cs" />
     <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
-    <Compile Include="Room\IEssentialsRoom.cs" />
     <Compile Include="Room\Interfaces.cs" />
     <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core
 
         ScheduledEventGroup FeatureEventGroup;
 
-        public IEssentialsRoom Room { get; private set; }
+        public EssentialsRoomBase Room { get; private set; }
 
         private Fusion.EssentialsHuddleSpaceFusionSystemControllerBase FusionRoom;
 
@@ -84,7 +84,7 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         void SetUpDevice()
         {
-            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IEssentialsRoom;
+            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as EssentialsRoomBase;
 
             if (Room != null)
             {

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

@@ -16,7 +16,7 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// 
     /// </summary>
-    public abstract class EssentialsRoomBase : ReconfigurableDevice, IEssentialsRoom
+    public abstract class EssentialsRoomBase : ReconfigurableDevice
     {
         /// <summary>
         ///

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

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using PepperDash.Essentials.Room.Config;
-using PepperDash.Essentials.Core.Devices;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Describes the basic functionality of an EssentialsRoom
-    /// </summary>
-    public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute
-    {
-        BoolFeedback OnFeedback { get; }
-
-        event EventHandler<EventArgs> RoomOccupancyIsSet;
-
-        BoolFeedback IsWarmingUpFeedback { get; }
-        BoolFeedback IsCoolingDownFeedback { get; }
-
-        IOccupancyStatusProvider RoomOccupancy { get; }
-        bool OccupancyStatusProviderIsRemote { get; }
-
-        bool IsMobileControlEnabled { get; }
-        IMobileControlRoomBridge MobileControlRoomBridge { get; }
-
-        string SourceListKey { get; }
-
-        SecondsCountdownTimer ShutdownPromptTimer { get; }
-        int ShutdownPromptSeconds { get; }
-        int ShutdownVacancySeconds { get; }
-        eShutdownType ShutdownType { get; }
-
-        EssentialsRoomEmergencyBase Emergency { get; }
-
-        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
-
-        string LogoUrlLightBkgnd { get; }
-        string LogoUrlDarkBkgnd { get; }
-
-        eVacancyMode VacancyMode { get; }
-
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
-
-        void StartShutdown(eShutdownType type);
-        void StartRoomVacancyTimer(eVacancyMode mode);
-
-        void Shutdown();
-
-        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
-
-        void PowerOnToDefaultOrLastSource();
-
-        void SetDefaultLevels();
-
-        void RoomVacatedForTimeoutPeriod(object o);
-    }
-
-}

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

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
@@ -66,6 +65,4 @@ namespace PepperDash.Essentials.Core
         bool RunDefaultCallRoute();
     }
     
-
-
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/AudioCodec/Interfaces/IHasAudioCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
     /// <summary>
     /// For rooms that have audio codec
     /// </summary>
-    public interface IHasAudioCodec:IHasInCallFeedback
+    public interface IHasAudioCodec
     {
         AudioCodecBase AudioCodec { get; }
+        BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -69,22 +69,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("directoryResults")]
         public List<DirectoryItem> CurrentDirectoryResults { get; private set; }
 
-        public List<DirectoryItem> Contacts
-        {
-            get
-            {
-                return CurrentDirectoryResults.OfType<DirectoryContact>().Cast<DirectoryItem>().ToList();
-            }
-        }
-
-        public List<DirectoryItem> Folders
-        {
-            get
-            {
-                return CurrentDirectoryResults.OfType<DirectoryFolder>().Cast<DirectoryItem>().ToList();
-            }
-        }
-
         /// <summary>
         /// Used to store the ID of the current folder for CurrentDirectoryResults
         /// </summary>
@@ -120,15 +104,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             SortDirectory();
         }
 
-        /// <summary>
-        /// Filters the CurrentDirectoryResults by the predicate
-        /// </summary>
-        /// <param name="predicate"></param>
-        public void FilterContacts(Func<DirectoryItem, bool> predicate)
-        {
-            CurrentDirectoryResults = CurrentDirectoryResults.Where(predicate).ToList();
-        }
-
         /// <summary>
         /// Sorts the DirectoryResults list to display all folders alphabetically, then all contacts alphabetically
         /// </summary>

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs

@@ -4,20 +4,15 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using PepperDash.Core;
-
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
-    [Flags]
     public enum eMeetingEventChangeType
     {
-        Unknown = 0,
-        MeetingStartWarning = 1,
-        MeetingStart = 2,
-        MeetingEndWarning = 4,
-        MeetingEnd = 8
+        Unkown = 0,
+        MeetingStartWarning,
+        MeetingStart,
+        MeetingEndWarning,
+        MeetingEnd
     }
 
     public interface IHasScheduleAwareness
@@ -37,10 +32,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 
         private int _meetingWarningMinutes = 5;
 
-        private Meeting _previousChangedMeeting;
-
-        private eMeetingEventChangeType _previousChangeType = eMeetingEventChangeType.Unknown;
-
         public int MeetingWarningMinutes
         {
             get { return _meetingWarningMinutes; }
@@ -84,71 +75,37 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             _scheduleChecker = new CTimer(CheckSchedule, null, pollTime, pollTime);
         }
 
-        /// <summary>
-        /// Helper method to fire MeetingEventChange.  Should only fire once for each changeType on each meeting
-        /// </summary>
-        /// <param name="changeType"></param>
-        /// <param name="meeting"></param>
         private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
         {
-            Debug.Console(2, "*****************OnMeetingChange.  id: {0} changeType: {1}**********************", meeting.Id, changeType);
-            if (changeType != (changeType & meeting.NotifiedChangeTypes))
-            {
-                // Add this change type to the NotifiedChangeTypes
-                meeting.NotifiedChangeTypes |= changeType;
-
             var handler = MeetingEventChange;
             if (handler != null)
             {
                 handler(this, new MeetingEventArgs() { ChangeType = changeType, Meeting = meeting });
             }
         }
-            else
-            {
-                Debug.Console(2, "Meeting: {0} already notified of changeType: {1}", meeting.Id, changeType);
-            }
-        }
 
-
-        /// <summary>
-        /// Checks the schedule to see if any MeetingEventChange updates should be fired
-        /// </summary>
-        /// <param name="o"></param>
         private void CheckSchedule(object o)
         {
-            //  Iterate the meeting list and check if any meeting need to do anything
+            //  Iterate the meeting list and check if any meeting need to do anythingk
 
-            const double meetingTimeEpsilon = 0.05;
+            const double meetingTimeEpsilon = 0.0001;
             foreach (var m in Meetings)
             {
-                var changeType = eMeetingEventChangeType.Unknown;
+                var changeType = eMeetingEventChangeType.Unkown;
 
-                if (eMeetingEventChangeType.MeetingStartWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStartWarning) && m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingStart.Seconds > 0)       // Meeting is about to start
-                {
-                    Debug.Console(2, "********************* MeetingStartWarning. TotalMinutes: {0}  Seconds: {1}", m.TimeToMeetingStart.TotalMinutes, m.TimeToMeetingStart.Seconds);
+                if (m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes)       // Meeting is about to start
                     changeType = eMeetingEventChangeType.MeetingStartWarning;
-                }
-                else if (eMeetingEventChangeType.MeetingStart != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStart) && Math.Abs(m.TimeToMeetingStart.TotalMinutes) < meetingTimeEpsilon)           // Meeting Start
-                {
-                    Debug.Console(2, "********************* MeetingStart");
+                else if (Math.Abs(m.TimeToMeetingStart.TotalMinutes) < meetingTimeEpsilon)           // Meeting Start
                     changeType = eMeetingEventChangeType.MeetingStart;
-                }
-                else if (eMeetingEventChangeType.MeetingEndWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEndWarning) && m.TimeToMeetingEnd.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingEnd.Seconds > 0)    // Meeting is about to end
-                {
-                    Debug.Console(2, "********************* MeetingEndWarning. TotalMinutes: {0}  Seconds: {1}", m.TimeToMeetingEnd.TotalMinutes, m.TimeToMeetingEnd.Seconds);
+                else if (m.TimeToMeetingEnd.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes)    // Meeting is about to end
                     changeType = eMeetingEventChangeType.MeetingEndWarning;
-                }
-                else if (eMeetingEventChangeType.MeetingEnd != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEnd) && Math.Abs(m.TimeToMeetingEnd.TotalMinutes) < meetingTimeEpsilon)             // Meeting has ended
-                {
-                    Debug.Console(2, "********************* MeetingEnd");
+                else if (Math.Abs(m.TimeToMeetingEnd.TotalMinutes) < meetingTimeEpsilon)             // Meeting has ended
                     changeType = eMeetingEventChangeType.MeetingEnd;
-                }
 
-                if (changeType != eMeetingEventChangeType.Unknown)
-                {
+                if (changeType != eMeetingEventChangeType.Unkown)
                     OnMeetingChange(changeType, m);
             }
-            }
+
 
         }
     }
@@ -158,24 +115,17 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public class Meeting
     {
-        [JsonProperty("minutesBeforeMeeting")]
         public int MinutesBeforeMeeting;
 
-        [JsonProperty("id")]
         public string Id { get; set; }
-        [JsonProperty("organizer")]
         public string Organizer { get; set; }
-        [JsonProperty("title")]
         public string Title { get; set; }
-        [JsonProperty("agenda")]
         public string Agenda { get; set; }
 
-        [JsonProperty("meetingWarningMinutes")]
         public TimeSpan MeetingWarningMinutes
         {
             get { return TimeSpan.FromMinutes(MinutesBeforeMeeting); }
         }
-        [JsonProperty("timeToMeetingStart")]
         public TimeSpan TimeToMeetingStart
         {
             get
@@ -183,7 +133,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
                 return StartTime - DateTime.Now;
             }
         }
-        [JsonProperty("timeToMeetingEnd")]
         public TimeSpan TimeToMeetingEnd
         {
             get
@@ -191,11 +140,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
                 return EndTime - DateTime.Now;
             }
         }
-        [JsonProperty("startTime")]
         public DateTime StartTime { get; set; }
-        [JsonProperty("endTime")]
         public DateTime EndTime { get; set; }
-        [JsonProperty("duration")]
         public TimeSpan Duration
         {
             get
@@ -203,34 +149,21 @@ namespace PepperDash.Essentials.Devices.Common.Codec
                 return EndTime - StartTime;
             }
         }
-        [JsonProperty("privacy")]
         public eMeetingPrivacy Privacy { get; set; }
-        [JsonProperty("joinable")]
         public bool Joinable
         {
             get
             {
-                var joinable = StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
-                    && DateTime.Now <= EndTime.AddMinutes(-5);
-                //Debug.Console(2, "Meeting Id: {0} joinable: {1}", Id, joinable);
-                return joinable;
+                return StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
+                    && DateTime.Now <= EndTime; //.AddMinutes(-5);
             }
         }
         //public string ConferenceNumberToDial { get; set; }
-        [JsonProperty("conferencePassword")]
         public string ConferencePassword { get; set; }
-        [JsonProperty("isOneButtonToPushMeeting")]
         public bool IsOneButtonToPushMeeting { get; set; }
 
-        [JsonProperty("calls")]
         public List<Call> Calls { get; private set; }
 
-        /// <summary>
-        /// Tracks the change types that have already been notified for
-        /// </summary>
-        [JsonIgnore]
-        public eMeetingEventChangeType NotifiedChangeTypes { get; set; }
-
         public Meeting()
         {
             Calls = new List<Call>();

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;

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
@@ -327,7 +311,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SpeakerTrack()
             {
                 Status = new Status2();
-                Availability = new Availability();
             }
         }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
@@ -16,7 +15,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     /// <summary>
     /// Describes the ability to mute and unmute a participant's video in a meeting
     /// </summary>
-	public interface IHasParticipantVideoMute : IHasParticipants
+    public interface IHasParticipantVideoMute:IHasParticipants
     {
         void MuteVideoForParticipant(int userId);
         void UnmuteVideoForParticipant(int userId);
@@ -50,8 +49,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
     {
         private List<Participant> _currentParticipants;
  
-		public List<Participant> CurrentParticipants
-		{
+        public List<Participant> CurrentParticipants {
             get { return _currentParticipants; }
             set
             {

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasVideoCodec.cs

@@ -11,9 +11,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 	/// <summary>
 	/// For rooms that have video codec
 	/// </summary>
-	public interface IHasVideoCodec:IHasInCallFeedback,IPrivacy
+	public interface IHasVideoCodec
 	{
 		VideoCodecBase VideoCodec { get; }
+		BoolFeedback InCallFeedback { get; }
 
         ///// <summary>
         ///// Make this more specific
@@ -25,6 +26,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		/// </summary>
 		IntFeedback CallTypeFeedback { get; }
 
+		/// <summary>
+		/// 
+		/// </summary>
+		BoolFeedback PrivacyModeIsOnFeedback { get; }
+
 		/// <summary>
 		/// When something in the room is sharing with the far end or through other means
 		/// </summary>

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

@@ -139,20 +139,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public override void Dial(Meeting meeting)
         {
-            Debug.Console(1, this, "Dial Meeting: {0}", meeting.Id);
-            var call = new CodecActiveCallItem() { Name = meeting.Title, Number = meeting.Id, Id = meeting.Id, Status = eCodecCallStatus.Dialing, Direction = eCodecCallDirection.Outgoing, Type = eCodecCallType.Video };
-            ActiveCalls.Add(call);
-            OnCallStatusChange(call);
-
-            //ActiveCallCountFeedback.FireUpdate();
-            // Simulate 2-second ring, then connecting, then connected
-            new CTimer(o =>
-            {
-                call.Type = eCodecCallType.Video;
-                SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connecting, call);
-                new CTimer(oo => SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connected, call), 1000);
-            }, 2000);
-
+            throw new NotImplementedException();
         }
 
         /// <summary>
@@ -409,15 +396,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				if (_CodecSchedule == null || _CodecSchedule.Meetings.Count == 0
 					|| _CodecSchedule.Meetings[_CodecSchedule.Meetings.Count - 1].StartTime < DateTime.Now)
 				{
-					_CodecSchedule = new CodecScheduleAwareness(1000);
+					_CodecSchedule = new CodecScheduleAwareness();
 					for (int i = 0; i < 5; i++)
 					{
 						var m = new Meeting();
-                        m.MinutesBeforeMeeting = 5;
-                        m.Id = i.ToString();
-                        m.Organizer = "Employee " + 1;
-						m.StartTime = DateTime.Now.AddMinutes(6).AddHours(i);
-						m.EndTime = DateTime.Now.AddHours(i).AddMinutes(16);
+						m.StartTime = DateTime.Now.AddMinutes(3).AddHours(i);
+						m.EndTime = DateTime.Now.AddHours(i).AddMinutes(30);
 						m.Title = "Meeting " + i;
                         m.Calls.Add(new Call() { Number = i + "meeting@fake.com"});
 						_CodecSchedule.Meetings.Add(m);

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/ResponseObjects.cs

@@ -276,9 +276,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				if (zoomRooms.Count > 0)
 				{
 					// If so, setup a rooms and contacts folder and add them.
-
-                    directory.ResultsFolderId = "root";
-
 					roomFolder.Name = "Rooms";
 					roomFolder.ParentFolderId = "root";
 					roomFolder.FolderId = "rooms";
@@ -295,17 +292,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				try
 				{
-                    if (zoomContacts.Count == 0)
+					if (zoomContacts.Count == 0) return directory;
 					{
-                        return directory;
-                    }
-					
 						foreach (Contact c in zoomContacts)
 						{
 							var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
 
-                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
-
 							if (folders.Count > 0)
 							{
 								contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
@@ -316,6 +308,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						directory.AddContactsToDirectory(contacts);
 					}
+				}
 				catch (Exception e)
 				{
 					Debug.Console(1, "Error converting Zoom Phonebook results to generic: {0}", e);
@@ -1168,11 +1161,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				}
 				set
 				{
-					//if (value != _hideConfSelfVideo)
-					//{
+					if (value != _hideConfSelfVideo)
+					{
 						_hideConfSelfVideo = value;
 						NotifyPropertyChanged("HideConfSelfVideo");
-					//}
+					}
 				}
 			}
 
@@ -1378,6 +1371,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			public bool CanEditClosedCaption { get; set; }
 			[JsonProperty("can_record")]
 			public bool CanRecord { get; set; }
+			// TODO [ ] 2021-07-20, jkd: Evaluate if event can be used to re-poll participant list
+			// - when in waiting room: "event": "ZRCUserChangedEventJoinedMeeting",
+			// - when admitted to call: "event": "ZRCUserChangedEventUserInfoUpdated",
+			// ISSUE [ ] when a zoom rooms device connects to a call with a waiting room, once admitted the zoom rooms device will be present 2x's in the participant list
+			// - each instance of the zoom rooms device will have a unique user id
 			[JsonProperty("event")]
 			public string Event { get; set; }
 			[JsonProperty("hand_status")]

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

@@ -3,17 +3,18 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro.CrestronThread;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using PepperDash.Core.Intersystem.Tokens;
 using PepperDash.Essentials.Core;
 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;
@@ -24,18 +25,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	public class ZoomRoom : VideoCodecBase, IHasCodecSelfView, IHasDirectoryHistoryStack, ICommunicationMonitor,
 		IRouting,
 		IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraMute, IHasCameraAutoMode,
-		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin,
-		IHasParticipantAudioMute, IHasSelfviewSize
+		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin, IHasParticipantAudioMute, IHasSelfviewSize
 	{
 		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;
@@ -53,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;
 
@@ -82,7 +84,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			PhonebookSyncState = new CodecPhonebookSyncState(Key + "--PhonebookSync");
 
-			PortGather = new CommunicationGather(Communication, "\x0A") {IncludeDelimiter = true};
+			PortGather = new CommunicationGather(Communication, "\x0A") { IncludeDelimiter = true };
 			PortGather.LineReceived += Port_LineReceived;
 
 			CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd,
@@ -93,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);
@@ -122,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);
@@ -137,6 +135,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			ContentSwappedWithThumbnailFeedback = new BoolFeedback(ContentSwappedWithThumbnailFeedbackFunc);
 
 			NumberOfScreensFeedback = new IntFeedback(NumberOfScreensFeedbackFunc);
+
 		}
 
 		public CommunicationGather PortGather { get; private set; }
@@ -155,19 +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);
 			}
 		}
 
@@ -265,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
 
@@ -291,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));
 				}
 			}
 		}
@@ -328,11 +314,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public BoolFeedback SelfviewIsOnFeedback { get; private set; }
 
-		public void GetSelfViewMode()
-		{
-			SendText("zConfiguration Video hide_conf_self_video");
-		}
-
 		public void SelfViewModeOn()
 		{
 			SendText("zConfiguration Video hide_conf_self_video: off");
@@ -365,17 +346,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public CodecDirectory CurrentDirectoryResult
 		{
 			get { return _currentDirectoryResult; }
-			private set
-			{
-				_currentDirectoryResult = value;
-
-				Debug.Console(2, this, "CurrentDirectoryResult Updated.  ResultsFolderId: {0}",
-					_currentDirectoryResult.ResultsFolderId);
-
-				CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
-
-				OnDirectoryResultReturned(_currentDirectoryResult);
-			}
 		}
 
 		public CodecPhonebookSyncState PhonebookSyncState { get; private set; }
@@ -389,26 +359,32 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					c => c.Name.IndexOf(searchString, 0, StringComparison.OrdinalIgnoreCase) > -1));
 
 			DirectoryBrowseHistoryStack.Clear();
-			CurrentDirectoryResult = directoryResults;
+			_currentDirectoryResult = directoryResults;
+
+			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void GetDirectoryFolderContents(string folderId)
 		{
-			var directoryResults = new CodecDirectory {ResultsFolderId = folderId};
+			var directoryResults = new CodecDirectory { ResultsFolderId = folderId };
 
 			directoryResults.AddContactsToDirectory(
 				DirectoryRoot.CurrentDirectoryResults.FindAll(c => c.ParentFolderId.Equals(folderId)));
 
 			DirectoryBrowseHistoryStack.Push(_currentDirectoryResult);
 
-			CurrentDirectoryResult = directoryResults;
+			_currentDirectoryResult = directoryResults;
+
+			OnDirectoryResultReturned(directoryResults);
 		}
 
 		public void SetCurrentDirectoryToRoot()
 		{
 			DirectoryBrowseHistoryStack.Clear();
 
-			CurrentDirectoryResult = DirectoryRoot;
+			_currentDirectoryResult = DirectoryRoot;
+
+			OnDirectoryResultReturned(DirectoryRoot);
 		}
 
 		public void GetDirectoryParentFolderContents()
@@ -420,7 +396,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			var currentDirectory = DirectoryBrowseHistoryStack.Pop();
 
-			CurrentDirectoryResult = currentDirectory;
+			_currentDirectoryResult = currentDirectory;
+
+			OnDirectoryResultReturned(currentDirectory);
 		}
 
 		public BoolFeedback CurrentDirectoryResultIsNotDirectoryRoot { get; private set; }
@@ -558,11 +536,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 						break;
 					}
+
 				}
 			};
 
             // This is to deal with incorrect object structure coming back from the Zoom Room on v 5.6.3
-			Configuration.Client.Call.Layout.PropertyChanged += (o, a) =>
+            Configuration.Client.Call.Layout.PropertyChanged += (o,a) =>
             {
                 switch (a.PropertyName)
                 {
@@ -584,6 +563,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                             LocalLayoutFeedback.FireUpdate();
                             break;
                         }
+
                 }
             };
 
@@ -685,14 +665,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		private void SetUpDirectory()
 		{
-			DirectoryRoot = new CodecDirectory() {ResultsFolderId = "root"};
-
-			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => CurrentDirectoryResult.ResultsFolderId != "root");
-
-			CurrentDirectoryResult = DirectoryRoot;
+			DirectoryRoot = new CodecDirectory();
 
 			DirectoryBrowseHistory = new List<CodecDirectory>();
 			DirectoryBrowseHistoryStack = new Stack<CodecDirectory>();
+
+			CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => _currentDirectoryResult != DirectoryRoot);
+
+			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 		}
 
 		private void SetUpRouting()
@@ -703,7 +683,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 			// Set up output ports
 			OutputPorts.Add(Output1);
-			OutputPorts.Add(Output2);
 		}
 
 		/// <summary>
@@ -758,12 +737,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			if (s == "1")
 			{
 				CommDebuggingIsOn = true;
-				Debug.Console(1, this, "Comm Debug Enabled.");
+				Debug.Console(0, this, "Comm Debug Enabled.");
 			}
 			else
 			{
 				CommDebuggingIsOn = false;
-				Debug.Console(1, this, "Comm Debug Disabled.");
+				Debug.Console(0, this, "Comm Debug Disabled.");
 			}
 		}
 
@@ -800,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;
 		}
 
 
@@ -871,7 +880,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			// Counts the curly braces
 			if (message.Contains("client_loop: send disconnect: Broken pipe"))
 			{
-				Debug.Console(1, this, Debug.ErrorLogLevel.Error,
+				Debug.Console(0, this, Debug.ErrorLogLevel.Error,
 					"Zoom Room Controller or App connected. Essentials will NOT control the Zoom Room until it is disconnected.");
 
 				return;
@@ -961,11 +970,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								SendText("echo off");
 								Thread.Sleep(100);
 								// set feedback exclusions
+								// TODO [ ] 2021-07-02, jkd - Verify if the /info/ vs /Info/ exludes the unwanted data
 								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");
 								Thread.Sleep(100);
-							SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/toll_free_callinLlist");
+								SendText("zFeedback Register Op: ex Path: /Event/InfoResult/Info/toll_free_callin_list");
 								Thread.Sleep(100);
 
 								if (!_props.DisablePhonebookAutoDownload)
@@ -1001,7 +1011,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 				var eType =
 					(eZoomRoomResponseType)
-						Enum.Parse(typeof (eZoomRoomResponseType), message["type"].Value<string>(), true);
+						Enum.Parse(typeof(eZoomRoomResponseType), message["type"].Value<string>(), true);
 
 				var topKey = message["topKey"].Value<string>();
 
@@ -1057,30 +1067,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									}
 								case "phonebooklistresult":
 									{
-								//  This result will always be the complete contents of the directory and never
-								//  A subset of the results via a search
-
 										JsonConvert.PopulateObject(responseObj.ToString(), Status.Phonebook);
 
-								var directoryResults =
-									zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
-
 										if (!PhonebookSyncState.InitialSyncComplete)
 										{
 											PhonebookSyncState.InitialPhonebookFoldersReceived();
 											PhonebookSyncState.PhonebookRootEntriesReceived();
-									PhonebookSyncState.SetPhonebookHasFolders(true);
+											PhonebookSyncState.SetPhonebookHasFolders(false);
 											PhonebookSyncState.SetNumberOfContacts(Status.Phonebook.Contacts.Count);
 										}
 
-								if (directoryResults.ResultsFolderId != "root")
-								{
-									directoryResults.ResultsFolderId = "root";
-								}
+										var directoryResults =
+											zStatus.Phonebook.ConvertZoomContactsToGeneric(Status.Phonebook.Contacts);
 
 										DirectoryRoot = directoryResults;
 
-								CurrentDirectoryResult = directoryResults;
+										_currentDirectoryResult = DirectoryRoot;
+
+										OnDirectoryResultReturned(directoryResults);
 
 										break;
 									}
@@ -1105,13 +1109,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 													if (participant != null)
 													{
-											Debug.Console(1, this,
-												"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} **********************************",
-												participant.Event);
-											Debug.Console(1, this,
-												"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} - UserId: {1} Name: {2} IsHost: {3}",
-												participant.Event, participant.UserId, participant.UserName, participant.IsHost);
-
 														switch (participant.Event)
 														{
 															case "ZRCUserChangedEventUserInfoUpdated":
@@ -1137,35 +1134,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 																}
 																break;
 															case "ZRCUserChangedEventJoinedMeeting":
-												{
-													var existingParticipant =
-														Status.Call.Participants.FirstOrDefault(p => p.UserId.Equals(participant.UserId));
-
-													if (existingParticipant != null)
-													{
-														Debug.Console(1, this,
-															"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ...updating matching UserId participant with UserId: {1} UserName: {2}",
-															participant.Event, participant.UserId, participant.UserName);
-
-														JsonConvert.PopulateObject(responseObj.ToString(), existingParticipant);
-													}
-													else
-													{
-														Debug.Console(1, this,
-															"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ...adding participant with UserId: {1} UserName: {2}",
-															participant.Event, participant.UserId, participant.UserName);
-
 																Status.Call.Participants.Add(participant);
-													}
-
 																break;
 														}
 													}
-
-											Debug.Console(1, this,
-												"[DeserializeResponse] zCommands.listparticipantresult - participant.event: {0} ***********************************",
-												participant.Event);
-										}
 												}
 												break;
 										}
@@ -1175,6 +1147,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 												Status.Call.Participants);
 
 										Participants.CurrentParticipants = participants;
+
 										PrintCurrentCallParticipants();
 
 										break;
@@ -1267,7 +1240,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 											{
 												Direction = eCodecCallDirection.Incoming,
 												Status = eCodecCallStatus.Ringing,
-										Type = eCodecCallType.Video,
+												Type = eCodecCallType.Unknown,
 												Name = incomingCall.callerName,
 												Id = incomingCall.callerJID
 											};
@@ -1308,10 +1281,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 										var disconnectEvent =
 											JsonConvert.DeserializeObject<zEvent.CallDisconnect>(responseObj.ToString());
 
-								Debug.Console(1, this,
-									"[DeserializeResponse] zEvent.calldisconnect ********************************************");
-								Debug.Console(1, this, "[DeserializeResponse] zEvent.calldisconnect - disconnectEvent.Successful: {0}",
-									disconnectEvent.Successful);
+										// TODO [ ] 2021-07-20, jkd
+										Debug.Console(1, this, "zEvent disconnectEvent.Successful: {0}", disconnectEvent.Successful);
 
 										if (disconnectEvent.Successful)
 										{
@@ -1321,19 +1292,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 												if (activeCall != null)
 												{
-											Debug.Console(1, this,
-												"[DeserializeResponse] zEvent.calldisconnect - ActiveCalls.Count: {0} activeCall.Id: {1}, activeCall.Number: {2} activeCall.Name: {3}, activeCall.IsActive: {4}",
-												ActiveCalls.Count, activeCall.Id, activeCall.Number, activeCall.Name, activeCall.IsActiveCall);
 													activeCall.Status = eCodecCallStatus.Disconnected;
 
 													OnCallStatusChange(activeCall);
 												}
 											}
+											var emptyList = new List<Participant>();
+											Participants.CurrentParticipants = emptyList;
 										}
 
-								Debug.Console(1, this,
-									"[DeserializeResponse] zEvent.calldisconnect ********************************************");
-
 										UpdateCallStatus();
 										break;
 									}
@@ -1384,23 +1351,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									{
 										var status = responseObj.ToObject<zEvent.PinStatusOfScreenNotification>();
 
-								Debug.Console(1, this, "Pin Status notification for UserId: {0}, ScreenIndex: {1}", status.PinnedUserId,
-									status.ScreenIndex);
+                                        Debug.Console(1, this, "Pin Status notification for UserId: {0}, ScreenIndex: {1}", status.PinnedUserId, status.ScreenIndex);
 
                                         Participant alreadyPinnedParticipant = null;
 
                                         // Check for a participant already pinned to the same screen index.
                                         if (status.PinnedUserId > 0)
                                         {
-									alreadyPinnedParticipant =
-										Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
+                                            alreadyPinnedParticipant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
 
                                             // Make sure that the already pinned participant isn't the same ID as for this message.  If true, clear the pinned fb.
                                             if (alreadyPinnedParticipant != null && alreadyPinnedParticipant.UserId != status.PinnedUserId)
                                             {
                                                 Debug.Console(1, this, "Participant: {0} with id: {1} already pinned to screenIndex {2}.  Clearing pinned fb.",
-											alreadyPinnedParticipant.Name, alreadyPinnedParticipant.UserId,
-											alreadyPinnedParticipant.ScreenIndexIsPinnedToFb);
+                                                    alreadyPinnedParticipant.Name, alreadyPinnedParticipant.UserId, alreadyPinnedParticipant.ScreenIndexIsPinnedToFb);
                                                 alreadyPinnedParticipant.IsPinnedFb = false;
                                                 alreadyPinnedParticipant.ScreenIndexIsPinnedToFb = -1;
                                             }
@@ -1415,19 +1379,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 										}
 										else
 										{
-									participant =
-										Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
+											participant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
 
 											if (participant == null && alreadyPinnedParticipant == null)
 											{
-										Debug.Console(1, this, "no matching participant found by pinned_user_id: {0} or screen_index: {1}",
-											status.PinnedUserId, status.ScreenIndex);
+												Debug.Console(1, this, "no matching participant found by pinned_user_id: {0} or screen_index: {1}", status.PinnedUserId, status.ScreenIndex);
 												return;
 											}
 											else if (participant != null)
 											{
-										Debug.Console(2, this, "Unpinning {0} with id: {1} from screen index: {2}", participant.Name,
-											participant.UserId, status.ScreenIndex);
+                                                Debug.Console(2, this, "Unpinning {0} with id: {1} from screen index: {2}", participant.Name, participant.UserId, status.ScreenIndex);
 												participant.IsPinnedFb = false;
 												participant.ScreenIndexIsPinnedToFb = -1;
 											}
@@ -1472,16 +1433,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 									{
 										JsonConvert.PopulateObject(responseObj.ToString(), Status.Call);
 
-								Debug.Console(1, this,
-									"[DeserializeResponse] zStatus.call - Status.Call.Info.meeting_id: {0} Status.Call.Info.meeting_list_item.meetingName: {1}",
-									Status.Call.Info.meeting_id, Status.Call.Info.meeting_list_item.meetingName);
-								foreach (var participant in Status.Call.Participants)
-								{
-									Debug.Console(1, this,
-										"[DeserializeResponse] zStatus.call - Status.Call.Participants participant.UserId: {0} participant.UserName: {1}",
-										participant.UserId, participant.UserName);
-								}
-
 										UpdateCallStatus();
 
 										break;
@@ -1577,26 +1528,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		/// <summary>
-		/// Retrieves the current call participants list
-		/// </summary>
-		public void GetCurrentCallParticipants()
-		{
-			SendText("zCommand Call ListParticipants");
-		}
-
-		/// <summary>
-		/// Prints the current call particiapnts list
-		/// </summary>
 		public void PrintCurrentCallParticipants()
 		{
-			if (Debug.Level <= 0) return;
+			if (Debug.Level <= 0)
+			{
+				return;
+			}
 
 			Debug.Console(1, this, "*************************** Call Participants **************************");
 			foreach (var participant in Participants.CurrentParticipants)
 			{
-				Debug.Console(1, this, "UserId: {3} Name: {0} Audio: {1} IsHost: {2}",
-					participant.Name, participant.AudioMuteFb, participant.IsHost, participant.UserId);
+				Debug.Console(1, this, "Name: {0} Audio: {1} IsHost: {2}", participant.Name,
+					participant.AudioMuteFb, participant.IsHost);
 			}
 			Debug.Console(1, this, "************************************************************************");
 		}
@@ -1616,19 +1559,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		private void UpdateCallStatus()
 		{
 			Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-				Status.Call != null ? Status.Call.Status.ToString() : "no call");
+				Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 			if (Status.Call != null)
 			{
 				var callStatus = Status.Call.Status;
 
-				// If not crrently in a meeting, intialize the call object
+				// If not currently in a meeting, intialize the call object
 				if (callStatus != zStatus.eCallStatus.IN_MEETING && callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
 				{
-					Debug.Console(1, this, "[UpdateCallStatus] Creating new Status.Call object");
-					Status.Call = new zStatus.Call {Status = callStatus};
-
-					OnCallStatusChange(new CodecActiveCallItem() {Status = eCodecCallStatus.Disconnected});
+					Debug.Console(1, this, "Creating new Status.Call object");
+					Status.Call = new zStatus.Call { Status = callStatus };
 
 					SetUpCallFeedbackActions();
 				}
@@ -1650,30 +1591,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								break;
 						}
 
-						if (!string.IsNullOrEmpty(Status.Call.Info.meeting_id))
-						{
+						// TODO [ ] 2021-07-20, jkd: Updated to populate name and ID when a new call is constructred
 						var newCall = new CodecActiveCallItem
 						{
 							Name = Status.Call.Info.meeting_list_item.meetingName,
-								Number = Status.Call.Info.meeting_list_item.meetingNumber,
 							Id = Status.Call.Info.meeting_id,
-								Status = newStatus,
-								Type = eCodecCallType.Video,
+							Status = newStatus
 						};
 
 						ActiveCalls.Add(newCall);
 
-							Debug.Console(1, this, "[UpdateCallStatus] IF w/ meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
-								Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+						Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
+							Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 						OnCallStatusChange(newCall);
 					}
-						else
-						{
-							Debug.Console(1, this, "[UpdateCallStatus] IF w/o meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
-								Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
-						}
-					}
 				}
 				else
 				{
@@ -1689,14 +1621,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							break;
 					}
 
-					Debug.Console(1, this, "[UpdateCallStatus] ELSE ActiveCalls.Count == {1} - Current Call Status: {0}",
-						Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+					Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
+						Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 					OnCallStatusChange(existingCall);
 				}
 			}
 
-			Debug.Console(1, this, "[UpdateCallStatus] Active Calls ------------------------------");
+			Debug.Console(1, this, "*************************** Active Calls ********************************");
 
 			// Clean up any disconnected calls left in the list
 			for (int i = 0; i < ActiveCalls.Count; i++)
@@ -1704,27 +1636,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				var call = ActiveCalls[i];
 
 				Debug.Console(1, this,
-					@"ID: {1}
-					Number: {5}
-					Name: {0}                    
+					@"Name: {0}
+                    ID: {1}
                     IsActive: {2}
                     Status: {3}
-                    Direction: {4}
-					IsActiveCall: {6}", call.Name, call.Id, call.IsActiveCall, call.Status, call.Direction, call.Number,
-					call.IsActiveCall);
+                    Direction: {4}", call.Name, call.Id, call.IsActiveCall, call.Status, call.Direction);
 
 				if (!call.IsActiveCall)
 				{
-					Debug.Console(1, this, "[UpdateCallStatus] Removing Inactive call.Id: {1} call.Name: {0}", call.Name, call.Id);
+					Debug.Console(1, this, "***** Removing Inactive Call: {0} *****", call.Name);
 					ActiveCalls.Remove(call);
 				}
 			}
-			Debug.Console(1, this, "[UpdateCallStatus] Active Calls ------------------------------");
+			Debug.Console(1, this, "**************************************************************************");
 
 			//clear participants list after call cleanup
+			if (ActiveCalls.Count == 0)
+			{
 				var emptyList = new List<Participant>();
 				Participants.CurrentParticipants = emptyList;
-			if (ActiveCalls.Count > 0) GetCurrentCallParticipants();
+			}
 		}
 
 		protected override void OnCallStatusChange(CodecActiveCallItem item)
@@ -1732,7 +1663,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			base.OnCallStatusChange(item);
 
 			Debug.Console(1, this, "[OnCallStatusChange] Current Call Status: {0}",
-				Status.Call != null ? Status.Call.Status.ToString() : "no call");
+				Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
 
 			if (_props.AutoDefaultLayouts)
 			{
@@ -1777,12 +1708,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public override void MuteOff()
 		{
-			Debug.Console(2, this, "Unmuting to previous level: {0}", _previousVolumeLevel);
-			SetVolume((ushort) _previousVolumeLevel);
+			SetVolume((ushort)_previousVolumeLevel);
 		}
 
 		public override void MuteOn()
 		{
+			_previousVolumeLevel = Configuration.Audio.Output.Volume; // Store the previous level for recall
+
 			SetVolume(0);
 		}
 
@@ -1884,20 +1816,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				layoutsCodec.AvailableLayoutsChanged += (o, a) =>
 				{
 					trilist.SetBool(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery
-					                                                             ==
-					                                                             (a.AvailableLayouts &
-					                                                              zConfiguration.eLayoutStyle.Gallery));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Gallery));
 					trilist.SetBool(joinMap.LayoutSpeakerIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Speaker
-					                                                             ==
-					                                                             (a.AvailableLayouts &
-					                                                              zConfiguration.eLayoutStyle.Speaker));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Speaker));
 					trilist.SetBool(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip
-					                                                           ==
-					                                                           (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.Strip));
 					trilist.SetBool(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll
-					                                                              ==
-					                                                              (a.AvailableLayouts &
-					                                                               zConfiguration.eLayoutStyle.ShareAll));
+						== (a.AvailableLayouts & zConfiguration.eLayoutStyle.ShareAll));
 
 					// pass the names used to set the layout through the bridge
 					trilist.SetString(joinMap.LayoutGalleryIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Gallery.ToString());
@@ -1908,13 +1833,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				
 				trilist.SetSigFalseAction(joinMap.SwapContentWithThumbnail.JoinNumber, () => layoutsCodec.SwapContentWithThumbnail());
 
-				layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(
-					trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);
-				layoutsCodec.ContentSwappedWithThumbnailFeedback.LinkInputSig(
-					trilist.BooleanInput[joinMap.SwapContentWithThumbnail.JoinNumber]);
+				layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);
+				layoutsCodec.ContentSwappedWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SwapContentWithThumbnail.JoinNumber]);
 
-				layoutsCodec.LayoutViewIsOnFirstPageFeedback.LinkInputSig(
-					trilist.BooleanInput[joinMap.LayoutIsOnFirstPage.JoinNumber]);
+				layoutsCodec.LayoutViewIsOnFirstPageFeedback.LinkInputSig(trilist.BooleanInput[joinMap.LayoutIsOnFirstPage.JoinNumber]);
 				layoutsCodec.LayoutViewIsOnLastPageFeedback.LinkInputSig(trilist.BooleanInput[joinMap.LayoutIsOnLastPage.JoinNumber]);
 				trilist.SetSigFalseAction(joinMap.LayoutTurnToNextPage.JoinNumber, () => layoutsCodec.LayoutTurnNextPage());
 				trilist.SetSigFalseAction(joinMap.LayoutTurnToPreviousPage.JoinNumber, () => layoutsCodec.LayoutTurnPreviousPage());
@@ -1924,7 +1846,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					{
 						try
 						{
-						var style = (zConfiguration.eLayoutStyle) Enum.Parse(typeof (zConfiguration.eLayoutStyle), s, true);
+							var style = (zConfiguration.eLayoutStyle)Enum.Parse(typeof(zConfiguration.eLayoutStyle), s, true);
 							SetLayout(style);
 						}
 						catch (Exception e)
@@ -1954,7 +1876,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				{
 					try
 					{
-						var size = (zConfiguration.eLayoutSize) Enum.Parse(typeof (zConfiguration.eLayoutSize), s, true);
+						var size = (zConfiguration.eLayoutSize)Enum.Parse(typeof(zConfiguration.eLayoutSize), s, true);					
 						var cmd = SelfviewPipSizes.FirstOrDefault(c => c.Command.Equals(size.ToString()));
 						SelfviewPipSizeSet(cmd);
 					}
@@ -2090,29 +2012,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="result"></param>
 		private void OnDirectoryResultReturned(CodecDirectory result)
 		{
-			try
-			{
-				Debug.Console(2, this, "OnDirectoryResultReturned");
-
-				var directoryResult = new CodecDirectory();
-
-				// If result is Root, create a copy and filter out contacts whose parent folder is not root
-				if (!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-				{
-					Debug.Console(2, this, "Filtering DirectoryRoot to remove contacts for display");
-
-					directoryResult.ResultsFolderId = result.ResultsFolderId;
-					directoryResult.AddFoldersToDirectory(result.Folders);
-					directoryResult.AddContactsToDirectory(
-						result.Contacts.Where((c) => c.ParentFolderId == result.ResultsFolderId).ToList());
-				}
-				else
-				{
-					directoryResult = result;
-				}
-
-				Debug.Console(2, this, "Updating directoryResult. IsOnRoot: {0}",
-					!CurrentDirectoryResultIsNotDirectoryRoot.BoolValue);
+			CurrentDirectoryResultIsNotDirectoryRoot.FireUpdate();
 
 			// This will return the latest results to all UIs.  Multiple indendent UI Directory browsing will require a different methodology
 			var handler = DirectoryResultReturned;
@@ -2120,15 +2020,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				handler(this, new DirectoryEventArgs
 				{
-						Directory = directoryResult,
+					Directory = result,
 					DirectoryIsOnRoot = !CurrentDirectoryResultIsNotDirectoryRoot.BoolValue
 				});
 			}
-			}
-			catch (Exception e)
-			{
-				Debug.Console(2, this, "Error: {0}", e);
-			}
 
 			//PrintDirectory(result);
 		}
@@ -2144,16 +2039,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);
@@ -2256,10 +2141,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		#region IHasParticipantPinUnpin Members
 
-		private Func<int> NumberOfScreensFeedbackFunc
-		{
-			get { return () => Status.NumberOfScreens.NumOfScreens; }
-		}
+		private Func<int> NumberOfScreensFeedbackFunc { get { return () => Status.NumberOfScreens.NumOfScreens; } }
 
 		public IntFeedback NumberOfScreensFeedback { get; private set; }
 
@@ -2401,7 +2283,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		#endregion
 
 		// TODO: #714 [ ] Implementation of IHasSelfviewPipSize
-
 		#region Implementation of IHasSelfviewPipSize
 
 		private CodecCommandWithLabel _currentSelfviewPipSize;
@@ -2443,24 +2324,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					p => p.Command.ToLower().Equals(Configuration.Call.Layout.Size.ToString().ToLower()));
 		}
 
+
 		#endregion
 
 		#region Implementation of IHasPhoneDialing
 
-		private Func<bool> PhoneOffHookFeedbackFunc
-		{
-			get { return () => Status.PhoneCall.OffHook; }
-		}
-
-		private Func<string> CallerIdNameFeedbackFunc
-		{
-			get { return () => Status.PhoneCall.PeerDisplayName; }
-		}
-
-		private Func<string> CallerIdNumberFeedbackFunc
-		{
-			get { return () => Status.PhoneCall.PeerNumber; }
-		}
+		private Func<bool> PhoneOffHookFeedbackFunc { get { return () => Status.PhoneCall.OffHook; } }
+		private Func<string> CallerIdNameFeedbackFunc { get { return () => Status.PhoneCall.PeerDisplayName; } }
+		private Func<string> CallerIdNumberFeedbackFunc { get { return () => Status.PhoneCall.PeerNumber; } }
 
 		public BoolFeedback PhoneOffHookFeedback { get; private set; }
 		public StringFeedback CallerIdNameFeedback { get; private set; }
@@ -2487,25 +2358,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 		public event EventHandler<LayoutInfoChangedEventArgs> AvailableLayoutsChanged;
 
-		private Func<bool> LayoutViewIsOnFirstPageFeedbackFunc
-		{
-			get { return () => Status.Layout.is_In_First_Page; }
-		}
-
-		private Func<bool> LayoutViewIsOnLastPageFeedbackFunc
-		{
-			get { return () => Status.Layout.is_In_Last_Page; }
-		}
-
-		private Func<bool> CanSwapContentWithThumbnailFeedbackFunc
-		{
-			get { return () => Status.Layout.can_Switch_Floating_Share_Content; }
-		}
-
-		private Func<bool> ContentSwappedWithThumbnailFeedbackFunc
-		{
-			get { return () => Configuration.Call.Layout.ShareThumb; }
-		}
+		private Func<bool> LayoutViewIsOnFirstPageFeedbackFunc { get { return () => Status.Layout.is_In_First_Page; } }
+		private Func<bool> LayoutViewIsOnLastPageFeedbackFunc { get { return () => Status.Layout.is_In_Last_Page; } }
+		private Func<bool> CanSwapContentWithThumbnailFeedbackFunc { get { return () => Status.Layout.can_Switch_Floating_Share_Content; } }
+		private Func<bool> ContentSwappedWithThumbnailFeedbackFunc { get { return () => Configuration.Call.Layout.ShareThumb; } }
 
 		public BoolFeedback LayoutViewIsOnFirstPageFeedback { get; private set; }
 
@@ -2554,7 +2410,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			var handler = AvailableLayoutsChanged;
 			if (handler != null)
 			{
-				handler(this, new LayoutInfoChangedEventArgs() {AvailableLayouts = availableLayouts});
+				handler(this, new LayoutInfoChangedEventArgs() { AvailableLayouts = availableLayouts });
 			}
 
 			AvailableLayouts = availableLayouts;
@@ -2575,8 +2431,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			if (CanSwapContentWithThumbnailFeedback.BoolValue)
 			{
-				var oppositeValue = ContentSwappedWithThumbnailFeedback.BoolValue ? "on" : "off";
-					// Get the value based on the opposite of the current state
+				var oppositeValue = ContentSwappedWithThumbnailFeedback.BoolValue ? "on" : "off"; // Get the value based on the opposite of the current state
 				// TODO: #697 [*] Need to verify the ternary above and make sure that the correct on/off value is being send based on the true/false value of the feedback
 				// to toggle the state
 				SendText(String.Format("zConfiguration Call Layout ShareThumb: {0}", oppositeValue));
@@ -2615,50 +2470,7 @@ 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);
-			}
-		}
-
-		/// <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);
-			}
+			throw new NotImplementedException();
 		}
 
 		public void LocalLayoutToggleSingleProminent()
@@ -2672,6 +2484,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		}		
 
 		#endregion
+
 	}
 
 	/// <summary>
@@ -2888,7 +2701,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 	{
 		public ZoomRoomFactory()
 		{
-			TypeNames = new List<string> {"zoomroom"};
+			TypeNames = new List<string> { "zoomroom" };
 		}
 
 		public override EssentialsDevice BuildDevice(DeviceConfig dc)

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>