#658 Initializes config properties in constructor(s)

add XML Comments

PepperDashEssentials/PepperDashEssentials.csproj

@@ -137,7 +137,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
+    <Compile Include="Room\Config\SimplRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -196,9 +196,20 @@ namespace PepperDash.Essentials.Room.Config
         public string DefaultAudioKey { get; set; }
         [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
+        [JsonProperty("destinationListKey")]
+        public string DestinationListKey { get; set; }
         [JsonProperty("defaultSourceItem")]
         public string DefaultSourceItem { get; set; }
-
+        /// <summary>
+        /// Indicates if the room supports advanced sharing
+        /// </summary>
+        [JsonProperty("supportsAdvancedSharing")]
+        public bool SupportsAdvancedSharing { get; set; }
+        /// <summary>
+        /// Indicates if non-tech users can change the share mode
+        /// </summary>
+        [JsonProperty("userCanChangeShareMode")]
+        public bool UserCanChangeShareMode { get; set; }
     }
 
     public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig

PepperDashEssentials/Room/Config/SimplRoomPropertiesConfig.cs

@@ -8,19 +8,19 @@ using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Room.Config
 {
-	public class DDVC01RoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
+	public class SimplRoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
 	{
 		[JsonProperty("roomPhoneNumber")]
 		public string RoomPhoneNumber { get; set; }
 		[JsonProperty("roomURI")]
 		public string RoomURI { get; set; }
 		[JsonProperty("speedDials")]
-		public List<DDVC01SpeedDial> SpeedDials { get; set; }
+		public List<SimplSpeedDial> SpeedDials { get; set; }
 		[JsonProperty("volumeSliderNames")]
 		public List<string> VolumeSliderNames { get; set; }
 	}
 
-	public class DDVC01SpeedDial
+	public class SimplSpeedDial
 	{
 		[JsonProperty("name")]
 		public string Name { get; set; }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/BasicConfig.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
 
 using Newtonsoft.Json.Linq;
 
@@ -25,12 +20,25 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("sourceLists")]
 		public Dictionary<string, Dictionary<string, SourceListItem>> SourceLists { get; set; }
 
-		[JsonProperty("tieLines")]
+        [JsonProperty("destinationLists")]
+        public Dictionary<string, Dictionary<string,DestinationListItem>> DestinationLists { get; set; }
+
+        [JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }
 
         [JsonProperty("joinMaps")]
         public Dictionary<string, JObject> JoinMaps { get; set; }
 
+        public BasicConfig()
+        {
+            Info = new InfoConfig();
+            Devices = new List<DeviceConfig>();
+            SourceLists = new Dictionary<string, Dictionary<string, SourceListItem>>();
+            DestinationLists = new Dictionary<string, Dictionary<string, DestinationListItem>>();
+            TieLines = new List<TieLineConfig>();
+            JoinMaps = new Dictionary<string, JObject>();
+        }
+
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
 		/// </summary>
@@ -42,6 +50,21 @@ namespace PepperDash.Essentials.Core.Config
 			return SourceLists[key];
 		}
 
+        /// <summary>
+        /// Retrieves a DestinationListItem based on the key
+        /// </summary>
+        /// <param name="key">key of the item to retrieve</param>
+        /// <returns>DestinationListItem if the key exists, null otherwise</returns>
+	    public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
+	    {
+	        if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
+	        {
+	            return null;
+	        }
+
+	        return DestinationLists[key];
+	    } 
+
         /// <summary>
         /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/EssentialsConfig.cs

@@ -51,6 +51,13 @@ namespace PepperDash.Essentials.Core.Config
 
 		[JsonProperty("rooms")]
         public List<DeviceConfig> Rooms { get; set; }
+
+
+        public EssentialsConfig()
+            : base()
+        {
+            Rooms = new List<DeviceConfig>();
+        }
 	}
 		
 	/// <summary>

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

@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DestinationListItem
+    {
+        [JsonProperty("sinkKey")]
+        public string SinkKey { get; set; }
+
+        private EssentialsDevice _sinkDevice;
+
+        [JsonIgnore]
+        public EssentialsDevice SinkDevice
+        {
+            get { return _sinkDevice ?? (_sinkDevice = DeviceManager.GetDeviceForKey(SinkKey) as EssentialsDevice); }
+        }
+
+        [JsonProperty("preferredName")]
+        public string PreferredName
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(Name))
+                {
+                    return Name;
+                }
+
+                return SinkDevice == null ? "---" : SinkDevice.Name;
+            }
+        }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("includeInDestinationList")]
+        public bool IncludeInDestinationList { get; set; }
+
+        [JsonProperty("order")]
+        public int Order { get; set; }
+
+        [JsonProperty("surfaceLocation")]
+        public int SurfaceLocation { get; set; }
+
+        [JsonProperty("verticalLocation")]
+        public int VerticalLocation { get; set; }
+        
+        [JsonProperty("horizontalLocation")]
+        public int HorizontalLocation { get; set; }
+
+        [JsonProperty("sinkType")]
+        public eRoutingSignalType SinkType { get; set; }
+    }
+}

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

@@ -46,7 +46,7 @@ namespace PepperDash.Essentials.Core
             CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
                 "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(SetDeviceStreamDebugging, "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
         }
 
@@ -387,15 +387,6 @@ namespace PepperDash.Essentials.Core
         /// <param name="s"></param>
         public static void SetDeviceStreamDebugging(string s)
         {
-            if (String.IsNullOrEmpty(s) || s.Contains("?"))
-            {
-                CrestronConsole.ConsoleCommandResponse(
-                    @"SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]
-    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use
-    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
-                return;
-            }
-
             var args = s.Split(' ');
 
             var deviceKey = args[0];
@@ -446,7 +437,7 @@ namespace PepperDash.Essentials.Core
             else
             {
                 device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                Debug.Console(0, "Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
+                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

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

@@ -130,10 +130,24 @@ namespace PepperDash.Essentials.Core
         [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
 
+        /// <summary>
+        /// Indicates if the device associated with this source is controllable
+        /// </summary>
+        [JsonProperty("isControllable")]
+        public bool IsControllable { get; set; }
+
+        /// <summary>
+        /// Indicates that the device associated with this source has audio available
+        /// </summary>
+        [JsonProperty("isAudioSource")]
+        public bool IsAudioSource { get; set; }
+
 		public SourceListItem()
 		{
 			Icon = "Blank";
 		}
+
+        
 	}
 
 	public class SourceRouteListItem

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Scheduler.cs

@@ -24,10 +24,6 @@ namespace PepperDash.Essentials.Core
             CrestronConsole.AddNewConsoleCommand(ClearEventsFromGroup, "ClearAllEvents", "Clears all scheduled events for this group", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(ListAllEventGroups, "ListAllEventGroups", "Lists all the event groups by key", ConsoleAccessLevelEnum.AccessOperator);
-
-            CrestronConsole.AddNewConsoleCommand(ListAllEventsForGroup, "ListEventsForGroup",
-                "Lists all events for the given group", ConsoleAccessLevelEnum.AccessOperator);
-
         }
 
         /// <summary>
@@ -36,26 +32,12 @@ namespace PepperDash.Essentials.Core
         /// <param name="groupName"></param>
         static void ClearEventsFromGroup(string groupName)
         {
-            if (!EventGroups.ContainsKey(groupName))
-            {
-                Debug.Console(0,
-                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
-                    groupName);
-                return;
-            }
-
             var group = EventGroups[groupName];
 
             if (group != null)
-            {
                 group.ClearAllEvents();
-
-                Debug.Console(0, "[Scheduler]: All events deleted from group '{0}'", groupName);
-            }
             else
-                Debug.Console(0,
-                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
-                    groupName);
+                Debug.Console(0, "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.", groupName);
         }
 
         static void ListAllEventGroups(string command)
@@ -67,33 +49,6 @@ namespace PepperDash.Essentials.Core
             }
         }
 
-        static void ListAllEventsForGroup(string args)
-        {
-            Debug.Console(0, "Getting events for group {0}...", args);
-
-            ScheduledEventGroup group;
-
-            if (!EventGroups.TryGetValue(args, out group))
-            {
-                Debug.Console(0, "Unabled to get event group for key {0}", args);
-                return;
-            }
-
-            foreach (var evt in group.ScheduledEvents)
-            {
-                Debug.Console(0,
-                    @"
-****Event key {0}****
-Event date/time: {1}
-Persistent: {2}
-Acknowlegable: {3}
-Recurrence: {4}
-Recurrence Days: {5}
-********************", evt.Key, evt.Value.DateAndTime, evt.Value.Persistent, evt.Value.Acknowledgeable,
-                    evt.Value.Recurrence.Recurrence, evt.Value.Recurrence.RecurrenceDays);
-            }
-        }
-
         /// <summary>
         /// Adds the event group to the global list
         /// </summary>

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

@@ -189,6 +189,7 @@
     <Compile Include="Device Info\IDeviceInfoProvider.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
+    <Compile Include="Devices\DestinationListItem.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -381,7 +381,7 @@ namespace PepperDash.Essentials
                         catch (Exception e)
                         {
                             Debug.Console(2, "Load Plugin not found. {0}.{2} is not a plugin factory. Exception: {1}",
-                                loadedAssembly.Name, e, type.Name);
+                                loadedAssembly.Name, e.Message, type.Name);
                             continue;
                         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs

@@ -14,7 +14,7 @@ namespace PepperDash.Essentials.Core.Queues
         protected readonly CrestronQueue<IQueueMessage> _queue;
         protected readonly Thread _worker;
         protected readonly CEvent _waitHandle = new CEvent();
-
+        
         private bool _delayEnabled;
         private int _delayTime;
 
@@ -155,10 +155,10 @@ namespace PepperDash.Essentials.Core.Queues
                 if (programEvent != eProgramStatusEventType.Stopping)
                     return;
 
-                Dispose(true);
+                Dispose();
             };
         }
-
+        
         /// <summary>
         /// Thread callback
         /// </summary>
@@ -199,12 +199,6 @@ namespace PepperDash.Essentials.Core.Queues
 
         public void Enqueue(IQueueMessage item)
         {
-            if (Disposed)
-            {
-                Debug.Console(1, this, "I've been disposed so you can't enqueue any messages.  Are you trying to dispatch a message while the program is stopping?");
-                return;
-            }
-
             _queue.Enqueue(item);
             _waitHandle.Set();
         }
@@ -231,13 +225,8 @@ namespace PepperDash.Essentials.Core.Queues
 
             if (disposing)
             {
-                Debug.Console(2, this, "Disposing...");
-                if (_queue != null && !_queue.Disposed)
-                {
-                    _queue.Clear();
-                    Enqueue(null);
-                }
-                _worker.Abort();
+                Enqueue(null);
+                _worker.Join();
                 _waitHandle.Close();
             }
 
@@ -246,7 +235,7 @@ namespace PepperDash.Essentials.Core.Queues
 
         ~GenericQueue()
         {
-            Dispose(true);
+            Dispose(false);
         }
 
         /// <summary>
@@ -412,7 +401,7 @@ namespace PepperDash_Essentials_Core.Queues
                 if (programEvent != eProgramStatusEventType.Stopping)
                     return;
 
-                Dispose(true);
+                Dispose();
             };
         }
 
@@ -482,13 +471,8 @@ namespace PepperDash_Essentials_Core.Queues
 
             if (disposing)
             {
-                Debug.Console(2, this, "Disposing...");
-                if (_queue != null && !_queue.Disposed)
-                {
-                    _queue.Clear();
-                    Enqueue(null);
-                }
-                _worker.Abort();
+                Enqueue(null);
+                _worker.Join();
                 _waitHandle.Close();
             }
 
@@ -497,7 +481,7 @@ namespace PepperDash_Essentials_Core.Queues
 
         ~GenericQueue()
         {
-            Dispose(true);
+            Dispose(false);
         }
 
         /// <summary>

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

@@ -169,15 +169,10 @@ namespace PepperDash.Essentials.Core
 
         void FeatureEventGroup_UserGroupCallBack(ScheduledEvent SchEvent, ScheduledEventCommon.eCallbackReason type)
         {
-            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "{0}:{1} @ {2}", SchEvent.Name, type, DateTime.Now);
-
             if (type == ScheduledEventCommon.eCallbackReason.NormalExpiration)
             {
-                SchEvent.Acknowledge();
-
                 if (SchEvent.Name == FeatureEnableEventName)
                 {
-                    
                     if (PropertiesConfig.EnableRoomOnWhenOccupied)
                         FeatureEnabled = true;
 
@@ -253,8 +248,9 @@ namespace PepperDash.Essentials.Core
                 schEvent = new ScheduledEvent(name, FeatureEventGroup);
 
             // Set up its initial properties
-            
-            schEvent.Acknowledgeable = false;
+
+            if(!schEvent.Acknowledgeable)
+                schEvent.Acknowledgeable = true;
 
             if(!schEvent.Persistent)
                 schEvent.Persistent = true;
@@ -291,7 +287,7 @@ namespace PepperDash.Essentials.Core
 
                 Debug.Console(1, this, "Event '{0}' Absolute time set to {1}", schEvent.Name, schEvent.DateAndTime.ToString());
 
-                //CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);
+                CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);
 
                 schEvent.Recurrence.Weekly(eventRecurrennce);
 

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

@@ -671,7 +671,7 @@ namespace PepperDash.Essentials.DM {
                 var ioSlotJoin = ioSlot - 1;
 
                 // Control
-                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
+                trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
 
                 if (TxDictionary.ContainsKey(ioSlot))
                 {

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

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
@@ -1185,6 +1184,7 @@ namespace PepperDash.Essentials.DM
                     "Unable to execute switch for inputSelector {0} to outputSelector {1}", inputSelector,
                     outputSelector);
                 return;
+
             }
 
             // Check to see if there's an off timer waiting on this and if so, cancel
@@ -1643,13 +1643,13 @@ namespace PepperDash.Essentials.DM
         {
             // Routing Control
             trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
-            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));
-            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbOutput));
-            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
-                o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.UsbInput));
+                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
+            trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
+                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
+            trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbOutput));
+            trilist.SetUShortSigAction(joinMap.InputUsb.JoinNumber + ioSlotJoin,
+                o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.UsbInput));
 
             //Routing Feedbacks
             VideoOutputFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[joinMap.OutputVideo.JoinNumber + ioSlotJoin]);

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

@@ -228,9 +228,9 @@ namespace PepperDash.Essentials.DM
 
                 // Control
                 trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
-                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
+                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Video));
                 trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
-                    o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));
+                    o => ExecuteSwitch(o, ioSlot, eRoutingSignalType.Audio));
 
                 trilist.SetStringSigAction(joinMap.OutputNames.JoinNumber + ioSlotJoin, s =>
                 {

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

@@ -368,9 +368,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             CodecSchedule = new CodecScheduleAwareness();
  
             //Set Feedback Actions
-            SetFeedbackActions();
+            CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
+            CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
+            CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
+            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.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
+            CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = SharingContentIsOnFeedback.FireUpdate;
+            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
+            CodecStatus.Status.Video.Input.MainVideoMute.ValueChangedAction = CameraIsOffFeedback.FireUpdate;
 
-            CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+			CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 				eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
 			HdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
 				eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this);
@@ -406,36 +418,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
-        private void SetFeedbackActions()
-        {
-            CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
-            CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
-            CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
-            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.Video.Selfview.Mode.ValueChangedAction = SelfviewIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Video.Selfview.PIPPosition.ValueChangedAction = ComputeSelfviewPipStatus;
-            CodecStatus.Status.Video.Layout.LayoutFamily.Local.ValueChangedAction = ComputeLocalLayout;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = SharingContentIsOnFeedback.FireUpdate;
-            CodecStatus.Status.Conference.Presentation.Mode.ValueChangedAction = FarEndIsSharingContentFeedback.FireUpdate;
-            try
-            {
-                CodecStatus.Status.Video.Input.MainVideoMute.ValueChangedAction = CameraIsOffFeedback.FireUpdate;
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, this, "Error setting MainVideuMute Action: {0}", ex);
-
-                if (ex.InnerException != null)
-                {
-                    Debug.Console(0, this, "Error setting MainVideuMute Action: {0}", ex);
-                }
-            }
-        }
-
-        /// <summary>
+		/// <summary>
 		/// Creates the fake OSD source, and connects it's AudioVideo output to the CodecOsdIn input
 		/// to enable routing 
 		/// </summary>

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

@@ -8,7 +8,6 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
@@ -1681,11 +1680,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public MainVideoSource MainVideoSource { get; set; }
             public MainVideoMute MainVideoMute { get; set; }
             public List<Source> Source { get; set; }
-
-            public Input2()
-            {
-                MainVideoMute = new MainVideoMute();
-            }
         }
 
         public class Local : ValueProperty
@@ -1881,7 +1875,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 Selfview = new Selfview();
                 Layout = new Layout();
-                Input = new Input2();
             }
         }