fix: update DMPS InputChange event handler

In some configurations, the InputChange handler can throw
a null reference exception due to a Feedback for
the input that triggered the event not existing. The
event handler now checks for the existence of a Feedback
for the input that triggered the event prior to attempting
to call the `FireUpdate` method. Addresses #1136

PepperDashEssentials/ControlSystem.cs

@@ -337,20 +337,19 @@ namespace PepperDash.Essentials
 		void Load()
 		{
 			LoadDevices();
+			LoadTieLines();
 			LoadRooms();
 			LoadLogoServer();
 
 			DeviceManager.ActivateAll();
 
-            LoadTieLines();
-
 		    var mobileControl = GetMobileControlDevice();
 
 		    if (mobileControl == null) return;
 
             mobileControl.LinkSystemMonitorToAppServer();
-
+		    
-        }
+		}
 
         /// <summary>
         /// Reads all devices from config and adds them to DeviceManager

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -334,7 +334,7 @@ namespace PepperDash.Essentials
 		/// route or commands
 		/// </summary>
 		/// <param name="name"></param>
-		public virtual void RunRouteAction(string routeKey, Action successCallback)
+		public void RunRouteAction(string routeKey, Action successCallback)
 		{
 			// Run this on a separate thread
 			new CTimer(o =>

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleSpaceRoom.cs

@@ -7,8 +7,7 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials
 {
-    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay, IHasCurrentVolumeControls, IRoomOccupancy,
+    public interface IEssentialsHuddleSpaceRoom : IEssentialsRoom, IHasCurrentSourceInfoChange, IRunRouteAction, IRunDefaultPresentRoute, IHasDefaultDisplay, IHasCurrentVolumeControls
-        IEmergency, IMicrophonePrivacy
     {
         bool ExcludeFromGlobalFunctions { get; }
 

PepperDashEssentials/Room/Types/Interfaces/IEssentialsHuddleVtc1Room.cs

@@ -8,8 +8,7 @@ using PepperDash.Essentials.Devices.Common.AudioCodec;
 namespace PepperDash.Essentials
 {
     public interface IEssentialsHuddleVtc1Room : IEssentialsRoom, IHasCurrentSourceInfoChange,
-         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback,
+         IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IHasDefaultDisplay, IHasInCallFeedback
-        IRoomOccupancy, IEmergency, IMicrophonePrivacy
     {
         EssentialsHuddleVtc1PropertiesConfig PropertiesConfig { get; }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs

@@ -81,15 +81,6 @@ namespace PepperDash.Essentials.Core
                         }
 					case eControlMethod.Telnet:
 						break;
-					case eControlMethod.SecureTcpIp:
-						{
-							var secureTcp = new GenericSecureTcpIpClient(deviceConfig.Key + "-secureTcp", c.Address, c.Port, c.BufferSize);
-							secureTcp.AutoReconnect = c.AutoReconnect;
-							if (secureTcp.AutoReconnect)
-								secureTcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-							comm = secureTcp;
-							break;
-						}
 					default:
 						break;
 				}				

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

@@ -72,10 +72,6 @@ namespace PepperDash.Essentials.Core
     {
         IBasicVolumeControls CurrentVolumeControls { get; }
 		event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-
-        void SetDefaultLevels();
-
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
 	}
 
 

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

@@ -148,20 +148,15 @@ namespace PepperDash.Essentials.Core.Fusion
                     ReadGuidFile(guidFilePath);
                 }
 
-                var occupancyRoom = Room as IRoomOccupancy;
+                if (Room.RoomOccupancy != null)
-
-                if (occupancyRoom != null)
                 {
-                    if (occupancyRoom.RoomOccupancy != null)
+                    if (Room.OccupancyStatusProviderIsRemote)
                     {
-                        if (occupancyRoom.OccupancyStatusProviderIsRemote)
+                        SetUpRemoteOccupancy();
-                        {
+                    }
-                            SetUpRemoteOccupancy();
+                    else
-                        }
+                    {
-                        else
+                        SetUpLocalOccupancy();
-                        {
-                            SetUpLocalOccupancy();
-                        }
                     }
                 }
 
@@ -1528,15 +1523,10 @@ namespace PepperDash.Essentials.Core.Fusion
             // Tie to method on occupancy object
             //occSensorShutdownMinutes.OutputSig.UserObject(new Action(ushort)(b => Room.OccupancyObj.SetShutdownMinutes(b));
 
-            var occRoom = Room as IRoomOccupancy;
 
-            if (occRoom != null)
-            {
-                occRoom.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
-                occRoom.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
-            }
             RoomOccupancyRemoteStringFeedback = new StringFeedback(() => _roomOccupancyRemoteString);
-            
+            Room.RoomOccupancy.RoomIsOccupiedFeedback.LinkInputSig(occSensorAsset.RoomOccupied.InputSig);
+            Room.RoomOccupancy.RoomIsOccupiedFeedback.OutputChange += RoomIsOccupiedFeedback_OutputChange;
             RoomOccupancyRemoteStringFeedback.LinkInputSig(occSensorAsset.RoomOccupancyInfo.InputSig);
 
             //}

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

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core
 
         ScheduledEventGroup FeatureEventGroup;
 
-        public IRoomOccupancy Room { get; private set; }
+        public IEssentialsRoom 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 IRoomOccupancy;
+            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IEssentialsRoom;
 
             if (Room != null)
             {
@@ -235,23 +235,12 @@ namespace PepperDash.Essentials.Core
 
                 if (FeatureEnabled)
                 {
-                    var essentialsRoom = Room as IEssentialsRoom;
-
-                    if (essentialsRoom != null) {
-                        if (!essentialsRoom.OnFeedback.BoolValue)
-                        {
-                            Debug.Console(1, this, "Powering Room on to default source");
-
-                            var defaultRouteRoom = Room as IRunDefaultPresentRoute;
-
-                            if (defaultRouteRoom != null)
-                            {
-                                defaultRouteRoom.RunDefaultPresentRoute();
-                            }
-                        }
-                    }
                     // Check room power state first
-                    
+                    if (!Room.OnFeedback.BoolValue)
+                    {
+                        Debug.Console(1, this, "Powering Room on to default source");
+                        Room.RunDefaultPresentRoute();
+                    }
                 }
             }
         }

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

@@ -17,10 +17,15 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface IEssentialsRoom : IKeyName, IReconfigurableDevice, IRunDefaultPresentRoute, IEnvironmentalControls
     {
-        BoolFeedback OnFeedback { get; }        
+        BoolFeedback OnFeedback { get; }
+
+        event EventHandler<EventArgs> RoomOccupancyIsSet;
 
         BoolFeedback IsWarmingUpFeedback { get; }
-        BoolFeedback IsCoolingDownFeedback { get; }        
+        BoolFeedback IsCoolingDownFeedback { get; }
+
+        IOccupancyStatusProvider RoomOccupancy { get; }
+        bool OccupancyStatusProviderIsRemote { get; }
 
         bool IsMobileControlEnabled { get; }
         IMobileControlRoomBridge MobileControlRoomBridge { get; }
@@ -30,16 +35,31 @@ namespace PepperDash.Essentials.Core
         SecondsCountdownTimer ShutdownPromptTimer { get; }
         int ShutdownPromptSeconds { get; }
         int ShutdownVacancySeconds { get; }
-        eShutdownType ShutdownType { get; }      
+        eShutdownType ShutdownType { get; }
+
+        EssentialsRoomEmergencyBase Emergency { get; }
+
+        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
 
         string LogoUrlLightBkgnd { get; }
         string LogoUrlDarkBkgnd { get; }
 
-        void StartShutdown(eShutdownType type);        
+        eVacancyMode VacancyMode { get; }
 
-        void Shutdown();        
+        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
 
-        void PowerOnToDefaultOrLastSource();               
+        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

@@ -41,6 +41,7 @@ namespace PepperDash.Essentials.Core
         void RunRouteAction(string routeKey, string sourceListKey);
 
         void RunRouteAction(string routeKey, string sourceListKey, Action successCallback);
+
     }
 
     /// <summary>
@@ -77,30 +78,4 @@ namespace PepperDash.Essentials.Core
         bool HasEnvironmentalControlDevices { get; }
     }
 
-    public interface IRoomOccupancy:IKeyed
-    {
-        IOccupancyStatusProvider RoomOccupancy { get; }
-        bool OccupancyStatusProviderIsRemote { get; }
-
-        void SetRoomOccupancy(IOccupancyStatusProvider statusProvider, int timeoutMinutes);
-
-        void RoomVacatedForTimeoutPeriod(object o);
-
-        void StartRoomVacancyTimer(eVacancyMode mode);
-
-        eVacancyMode VacancyMode { get; }
-
-        event EventHandler<EventArgs> RoomOccupancyIsSet;
-    }
-
-    public interface IEmergency
-    {
-        EssentialsRoomEmergencyBase Emergency { get; }
-    }
-
-    public interface IMicrophonePrivacy
-    {
-        Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; }
-    }
-
 }

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

@@ -991,28 +991,41 @@ namespace PepperDash.Essentials.DM
                     case (DMInputEventIds.OnlineFeedbackEventId):
                         {
                             Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+
+							if(!InputEndpointOnlineFeedbacks.ContainsKey(args.Number)){
+								break;
+							}
+							InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                             break;
                         }
                     case (DMInputEventIds.EndpointOnlineEventId):
                         {
                             Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+
+							if(!InputEndpointOnlineFeedbacks.ContainsKey(args.Number)){
+								break;
+							}
                             InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
                             break;
                         }
                     case (DMInputEventIds.VideoDetectedEventId):
                         {
                             Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
+
+							if(!VideoInputSyncFeedbacks.ContainsKey(args.Number)){
+								break;
+							}
                             VideoInputSyncFeedbacks[args.Number].FireUpdate();
                             break;
                         }
                     case (DMInputEventIds.InputNameEventId):
                         {
                             Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                            if(InputNameFeedbacks.ContainsKey(args.Number))
+                            if(!InputNameFeedbacks.ContainsKey(args.Number))
                             {
-                                InputNameFeedbacks[args.Number].FireUpdate();
+								break;
                             }
+							InputNameFeedbacks[args.Number].FireUpdate();
                             break;
                         }
                 }