refactoring Fusion room classes

added DualDisplay Fusion support

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -3,8 +3,6 @@ using System.Linq;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.Fusion;
-
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
@@ -14,12 +12,11 @@ namespace PepperDash.Essentials.Fusion
 {
     public class EssentialsHuddleVtc1FusionController : EssentialsHuddleSpaceFusionSystemControllerBase
     {
-        BooleanSigData CodecIsInCall;
+        private BooleanSigData _codecIsInCall;
 
         public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
             : base(room, ipId)
         {
-
         }
 
         /// <summary>
@@ -33,11 +30,17 @@ namespace PepperDash.Essentials.Fusion
         /// <summary>
         /// Creates a static asset for the codec and maps the joins to the main room symbol
         /// </summary>
-        void SetUpCodec()
+        private void SetUpCodec()
         {
             try
             {
-                var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
+                var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+                if (essentialsHuddleVtc1Room == null)
+                {
+                    return;
+                }
+
+                var codec = essentialsHuddleVtc1Room.VideoCodec;
 
                 if (codec == null)
                 {
@@ -45,23 +48,35 @@ namespace PepperDash.Essentials.Fusion
                     return;
                 }
 
-                codec.UsageTracker = new UsageTracking(codec);
+                codec.UsageTracker = new UsageTracking(codec) {UsageIsTracked = true};
-                codec.UsageTracker.UsageIsTracked = true;
                 codec.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
 
-                var codecPowerOnAction = new Action<bool>(b => { if (!b) codec.StandbyDeactivate(); });
+                var codecPowerOnAction = new Action<bool>(b =>
-                var codecPowerOffAction = new Action<bool>(b => { if (!b) codec.StandbyActivate(); });
+                {
+                    if (!b)
+                    {
+                        codec.StandbyDeactivate();
+                    }
+                });
+                var codecPowerOffAction = new Action<bool>(b =>
+                {
+                    if (!b)
+                    {
+                        codec.StandbyActivate();
+                    }
+                });
 
                 // Map FusionRoom Attributes:
 
                 // Codec volume
                 var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
-                codecVolume.OutputSig.UserObject = new Action<ushort>(b => (codec as IBasicVolumeWithFeedback).SetVolume(b));
+                codecVolume.OutputSig.UserObject =
+                    new Action<ushort>(b => (codec as IBasicVolumeWithFeedback).SetVolume(b));
                 (codec as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(codecVolume.InputSig);
 
                 // In Call Status
-                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
+                _codecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
-                codec.CallStatusChange += new EventHandler<Core.Devices.Codec.CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
+                codec.CallStatusChange += codec_CallStatusChange;
 
                 // Online status
                 if (codec is ICommunicationMonitor)
@@ -69,11 +84,10 @@ namespace PepperDash.Essentials.Fusion
                     var c = codec as ICommunicationMonitor;
                     var codecOnline = FusionRoom.CreateOffsetBoolSig(122, "Online - VC 1", eSigIoMask.InputSigOnly);
                     codecOnline.InputSig.BoolValue = c.CommunicationMonitor.Status == MonitorStatus.IsOk;
-                    c.CommunicationMonitor.StatusChange += (o, a) =>
+                    c.CommunicationMonitor.StatusChange +=
-                        {
+                        (o, a) => { codecOnline.InputSig.BoolValue = a.Status == MonitorStatus.IsOk; };
-                            codecOnline.InputSig.BoolValue = a.Status == MonitorStatus.IsOk;
+                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key,
-                        };
+                        "Online - VC 1");
-                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, "Online - VC 1");
                 }
 
                 // Codec IP Address
@@ -83,10 +97,7 @@ namespace PepperDash.Essentials.Fusion
                 string codecIpAddress = string.Empty;
                 int codecIpPort = 0;
 
-                StringSigData codecIpAddressSig;
+                if (codecComm is GenericSshClient)
-                StringSigData codecIpPortSig;
-
-                if(codecComm is GenericSshClient)
                 {
                     codecIpAddress = (codecComm as GenericSshClient).Hostname;
                     codecIpPort = (codecComm as GenericSshClient).Port;
@@ -101,14 +112,16 @@ namespace PepperDash.Essentials.Fusion
 
                 if (codecHasIpInfo)
                 {
-                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
+                    StringSigData codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC",
+                        eSigIoMask.InputSigOnly);
                     codecIpAddressSig.InputSig.StringValue = codecIpAddress;
 
-                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
+                    StringSigData codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC",
+                        eSigIoMask.InputSigOnly);
                     codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
                 }
 
-                var tempAsset = new FusionAsset();
+                FusionAsset tempAsset;
 
                 var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(c => c.Key.Equals(codec.Key));
 
@@ -119,11 +132,13 @@ namespace PepperDash.Essentials.Fusion
                 else
                 {
                     // Create a new asset
-                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), codec.Name, "Codec", "");
+                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), codec.Name,
+                        "Codec", "");
                     FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
                 }
 
-                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
+                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
+                    tempAsset.InstanceId);
                 codecAsset.PowerOn.OutputSig.UserObject = codecPowerOnAction;
                 codecAsset.PowerOff.OutputSig.UserObject = codecPowerOffAction;
                 codec.StandbyIsOnFeedback.LinkComplementInputSig(codecAsset.PowerOn.InputSig);
@@ -139,11 +154,16 @@ namespace PepperDash.Essentials.Fusion
             }
         }
 
-        void codec_CallStatusChange(object sender, Core.Devices.Codec.CodecCallStatusItemChangeEventArgs e)
+        private void codec_CallStatusChange(object sender, Core.Devices.Codec.CodecCallStatusItemChangeEventArgs e)
         {
-            var codec = (Room as EssentialsHuddleVtc1Room).VideoCodec;
+            var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+            if (essentialsHuddleVtc1Room == null)
+            {
+                return;
+            }
+            var codec = essentialsHuddleVtc1Room.VideoCodec;
 
-            CodecIsInCall.InputSig.BoolValue = codec.IsInCall;
+            _codecIsInCall.InputSig.BoolValue = codec.IsInCall;
         }
 
         // These methods are overridden because they access the room class which is of a different type
@@ -160,27 +180,37 @@ namespace PepperDash.Essentials.Fusion
 
             FusionRoom.FusionStateChange += FusionRoom_FusionStateChange;
 
-            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.DeviceExtenderSigChange += FusionRoomSchedule_DeviceExtenderSigChange;
+            FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.DeviceExtenderSigChange +=
-            FusionRoom.ExtenderFusionRoomDataReservedSigs.DeviceExtenderSigChange += ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange;
+                FusionRoomSchedule_DeviceExtenderSigChange;
+            FusionRoom.ExtenderFusionRoomDataReservedSigs.DeviceExtenderSigChange +=
+                ExtenderFusionRoomDataReservedSigs_DeviceExtenderSigChange;
             FusionRoom.OnlineStatusChange += FusionRoom_OnlineStatusChange;
 
-            CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule",
-            CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
+                "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod",
+                "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(CreateAdHocMeeting, "FusCreateMeeting",
+                "Creates and Ad Hoc meeting for on hour or until the next meeting",
+                ConsoleAccessLevelEnum.AccessOperator);
 
             // Room to fusion room
             Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
 
             // Moved to 
-            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source", eSigIoMask.InputSigOnly);
+            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source",
+                eSigIoMask.InputSigOnly);
             // Don't think we need to get current status of this as nothing should be alive yet. 
-            (Room as EssentialsHuddleVtc1Room).CurrentSourceChange += Room_CurrentSourceInfoChange;
-
-
-            FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
-            // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
 
+            var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+            if (essentialsHuddleVtc1Room != null)
+            {
+                essentialsHuddleVtc1Room.CurrentSourceChange += Room_CurrentSourceInfoChange;
+                FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction(
+    essentialsHuddleVtc1Room.PowerOnToDefaultOrLastSource);
+                FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(
+                    () => essentialsHuddleVtc1Room.RunRouteAction("roomOff", Room.SourceListKey));
+            }
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
         }
@@ -188,7 +218,14 @@ namespace PepperDash.Essentials.Fusion
         protected override void SetUpSources()
         {
             // Sources
-            var dict = ConfigReader.ConfigObject.GetSourceListForKey((Room as EssentialsHuddleVtc1Room).SourceListKey);
+            var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+
+            if (essentialsHuddleVtc1Room == null)
+            {
+                return;
+            }
+
+            var dict = ConfigReader.ConfigObject.GetSourceListForKey(essentialsHuddleVtc1Room.SourceListKey);
             if (dict != null)
             {
                 // NEW PROCESS:
@@ -200,7 +237,9 @@ namespace PepperDash.Essentials.Fusion
                     TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 5) // We only have five spots
+                    {
                         break;
+                    }
                 }
 
                 var discPlayers = dict.Where(d => d.Value.SourceDevice is IDiscPlayerControls);
@@ -210,7 +249,9 @@ namespace PepperDash.Essentials.Fusion
                     TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 5) // We only have five spots
+                    {
                         break;
+                    }
                 }
 
                 var laptops = dict.Where(d => d.Value.SourceDevice is Core.Devices.Laptop);
@@ -220,26 +261,22 @@ namespace PepperDash.Essentials.Fusion
                     TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 10) // We only have ten spots???
-                        break;
-                }
-
-                foreach (var kvp in dict)
-                {
-                    var usageDevice = kvp.Value.SourceDevice as IUsageTracking;
-
-                    if (usageDevice != null)
                     {
-                        usageDevice.UsageTracker = new UsageTracking(usageDevice as Device);
+                        break;
-                        usageDevice.UsageTracker.UsageIsTracked = true;
-                        usageDevice.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
                     }
                 }
 
+                foreach (var usageDevice in dict.Select(kvp => kvp.Value.SourceDevice).OfType<IUsageTracking>())
+                {
+                    usageDevice.UsageTracker = new UsageTracking(usageDevice as Device) {UsageIsTracked = true};
+                    usageDevice.UsageTracker.DeviceUsageEnded +=
+                        UsageTracker_DeviceUsageEnded;
+                }
             }
             else
             {
                 Debug.Console(1, this, "WARNING: Config source list '{0}' not found for room '{1}'",
-                    (Room as EssentialsHuddleVtc1Room).SourceListKey, Room.Key);
+                    essentialsHuddleVtc1Room.SourceListKey, Room.Key);
             }
         }
 
@@ -253,40 +290,60 @@ namespace PepperDash.Essentials.Fusion
 
                 //  Consider updating this in multiple display systems
 
-                foreach (DisplayBase display in displays)
+                foreach (var display in displays.Cast<DisplayBase>())
                 {
-                    display.UsageTracker = new UsageTracking(display);
+                    display.UsageTracker = new UsageTracking(display) {UsageIsTracked = true};
-                    display.UsageTracker.UsageIsTracked = true;
+                    display.UsageTracker.DeviceUsageEnded +=
-                    display.UsageTracker.DeviceUsageEnded += new EventHandler<DeviceUsageEventArgs>(UsageTracker_DeviceUsageEnded);
+                        UsageTracker_DeviceUsageEnded;
                 }
 
-                var defaultDisplay = (Room as EssentialsHuddleVtc1Room).DefaultDisplay as DisplayBase;
+                var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+                if (essentialsHuddleVtc1Room == null)
+                {
+                    return;
+                }
+
+                var defaultDisplay = essentialsHuddleVtc1Room.DefaultDisplay as DisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
                     return;
                 }
 
-                var dispPowerOnAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOn(); });
+                var dispPowerOnAction = new Action<bool>(b =>
-                var dispPowerOffAction = new Action<bool>(b => { if (!b) defaultDisplay.PowerOff(); });
+                {
+                    if (!b)
+                    {
+                        defaultDisplay.PowerOn();
+                    }
+                });
+                var dispPowerOffAction = new Action<bool>(b =>
+                {
+                    if (!b)
+                    {
+                        defaultDisplay.PowerOff();
+                    }
+                });
 
                 // Display to fusion room sigs
                 FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
                 FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
                 defaultDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
                 if (defaultDisplay is IDisplayUsage)
+                {
                     (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
-
+                }
 
 
                 MapDisplayToRoomJoins(1, 158, defaultDisplay);
 
 
-                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
+                var deviceConfig =
+                    ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
 
                 //Check for existing asset in GUIDs collection
 
-                var tempAsset = new FusionAsset();
+                FusionAsset tempAsset;
 
                 if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
                 {
@@ -295,11 +352,13 @@ namespace PepperDash.Essentials.Fusion
                 else
                 {
                     // Create a new asset
-                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), defaultDisplay.Name, "Display", "");
+                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom),
+                        defaultDisplay.Name, "Display", "");
                     FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
                 }
 
-                var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
+                var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
+                    tempAsset.InstanceId);
                 dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
                 dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
                 defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
@@ -312,30 +371,59 @@ namespace PepperDash.Essentials.Fusion
             {
                 Debug.Console(1, this, "Error setting up display in Fusion: {0}", e);
             }
-
         }
 
         protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
         {
-            string displayName = string.Format("Display {0} - ", displayIndex);
+            var displayName = string.Format("Display {0} - ", displayIndex);
 
 
-            if (display == (Room as EssentialsHuddleVtc1Room).DefaultDisplay)
+            var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+            if (essentialsHuddleVtc1Room == null || display != essentialsHuddleVtc1Room.DefaultDisplay)
             {
-                // Power on
+                return;
-                var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint)joinOffset, displayName + "Power On", eSigIoMask.InputOutputSig);
-                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOn(); });
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-
-                // Power Off
-                var defaultDisplayPowerOff = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 1, displayName + "Power Off", eSigIoMask.InputOutputSig);
-                defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b => { if (!b) display.PowerOff(); }); ;
-                display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
-
-                // 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 EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
             }
+            // Power on
+            var defaultDisplayPowerOn = FusionRoom.CreateOffsetBoolSig((uint) joinOffset, displayName + "Power On",
+                eSigIoMask.InputOutputSig);
+            defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b =>
+            {
+                if (!b)
+                {
+                    display.PowerOn();
+                }
+            });
+            display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+            // Power Off
+
+            FusionRoom.CreateOffsetBoolSig((uint) joinOffset + 1,
+                displayName + "Power Off", eSigIoMask.InputOutputSig);
+            defaultDisplayPowerOn.OutputSig.UserObject = new Action<bool>(b =>
+            {
+                if (!b)
+                {
+                    display.PowerOff();
+                }
+            });
+            
+            display.PowerIsOnFeedback.LinkInputSig(defaultDisplayPowerOn.InputSig);
+
+            // Current Source
+            var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint) joinOffset + 8,
+                displayName + "Source None", eSigIoMask.InputOutputSig);
+            defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b =>
+            {
+                if (b)
+                {
+                    return;
+                }
+                var huddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+                if (huddleVtc1Room != null)
+                {
+                    huddleVtc1Room.RunRouteAction("roomOff", Room.SourceListKey);
+                }
+            });
         }
     }
 }

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

@@ -0,0 +1,225 @@
+using System;
+using System.Linq;
+using Crestron.SimplSharpPro;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.Fusion
+{
+    public class EssentialsHuddleVtc1FusionController : EssentialsHuddleSpaceFusionSystemControllerBase
+    {
+        private BooleanSigData _codecIsInCall;
+
+        private readonly EssentialsHuddleVtc1Room _room;
+
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
+            : base(room, ipId)
+        {
+            _room = room;
+        }
+
+        /// <summary>
+        /// Called in base class constructor before RVI and GUID files are built
+        /// </summary>
+        protected override void ExecuteCustomSteps()
+        {
+            SetUpCodec();
+            base.ExecuteCustomSteps();
+        }
+
+        /// <summary>
+        /// Creates a static asset for the codec and maps the joins to the main room symbol
+        /// </summary>
+        private void SetUpCodec()
+        {
+            try
+            {
+                var essentialsHuddleVtc1Room = Room as EssentialsHuddleVtc1Room;
+                if (essentialsHuddleVtc1Room == null)
+                {
+                    return;
+                }
+
+                var codec = essentialsHuddleVtc1Room.VideoCodec;
+
+                if (codec == null)
+                {
+                    Debug.Console(1, this, "Cannot link codec to Fusion because codec is null");
+                    return;
+                }
+
+                codec.UsageTracker = new UsageTracking(codec) {UsageIsTracked = true};
+                codec.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
+
+                var codecPowerOnAction = new Action<bool>(b =>
+                {
+                    if (!b)
+                    {
+                        codec.StandbyDeactivate();
+                    }
+                });
+                var codecPowerOffAction = new Action<bool>(b =>
+                {
+                    if (!b)
+                    {
+                        codec.StandbyActivate();
+                    }
+                });
+
+                // Map FusionRoom Attributes:
+
+                // Codec volume
+                var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
+                codecVolume.OutputSig.UserObject =
+                    new Action<ushort>(b => (codec as IBasicVolumeWithFeedback).SetVolume(b));
+                (codec as IBasicVolumeWithFeedback).VolumeLevelFeedback.LinkInputSig(codecVolume.InputSig);
+
+                // In Call Status
+                _codecIsInCall = FusionRoom.CreateOffsetBoolSig(69, "Conf - VC 1 In Call", eSigIoMask.InputSigOnly);
+                codec.CallStatusChange += codec_CallStatusChange;
+
+                // Online status
+                if (codec is ICommunicationMonitor)
+                {
+                    var c = codec as ICommunicationMonitor;
+                    var codecOnline = FusionRoom.CreateOffsetBoolSig(122, "Online - VC 1", eSigIoMask.InputSigOnly);
+                    codecOnline.InputSig.BoolValue = c.CommunicationMonitor.Status == MonitorStatus.IsOk;
+                    c.CommunicationMonitor.StatusChange +=
+                        (o, a) => { codecOnline.InputSig.BoolValue = a.Status == MonitorStatus.IsOk; };
+                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key,
+                        "Online - VC 1");
+                }
+
+                // Codec IP Address
+                var codecHasIpInfo = false;
+                var codecComm = codec.Communication;
+
+                var codecIpAddress = string.Empty;
+                var codecIpPort = 0;
+
+                if (codecComm is GenericSshClient)
+                {
+                    codecIpAddress = (codecComm as GenericSshClient).Hostname;
+                    codecIpPort = (codecComm as GenericSshClient).Port;
+                    codecHasIpInfo = true;
+                }
+                else if (codecComm is GenericTcpIpClient)
+                {
+                    codecIpAddress = (codecComm as GenericTcpIpClient).Hostname;
+                    codecIpPort = (codecComm as GenericTcpIpClient).Port;
+                    codecHasIpInfo = true;
+                }
+
+                if (codecHasIpInfo)
+                {
+                    var codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC",
+                        eSigIoMask.InputSigOnly);
+                    codecIpAddressSig.InputSig.StringValue = codecIpAddress;
+
+                    var codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC",
+                        eSigIoMask.InputSigOnly);
+                    codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
+                }
+
+                FusionAsset tempAsset;
+
+                var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(c => c.Key.Equals(codec.Key));
+
+                if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+                {
+                    tempAsset = FusionStaticAssets[deviceConfig.Uid];
+                }
+                else
+                {
+                    // Create a new asset
+                    tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom), codec.Name,
+                        "Codec", "");
+                    FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
+                }
+
+                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
+                    tempAsset.InstanceId);
+                codecAsset.PowerOn.OutputSig.UserObject = codecPowerOnAction;
+                codecAsset.PowerOff.OutputSig.UserObject = codecPowerOffAction;
+                codec.StandbyIsOnFeedback.LinkComplementInputSig(codecAsset.PowerOn.InputSig);
+
+                // TODO: Map relevant attributes on asset symbol
+
+                codecAsset.TrySetMakeModel(codec);
+                codecAsset.TryLinkAssetErrorToCommunication(codec);
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error setting up codec in Fusion: {0}", e);
+            }
+        }
+
+        #region Overrides of EssentialsHuddleSpaceFusionSystemControllerBase
+
+        protected override void SetUpDisplay()
+        {
+            base.SetUpDisplay();
+
+            var defaultDisplay = _room.DefaultDisplay as DisplayBase;
+
+            if (defaultDisplay == null)
+            {
+                Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
+                return;
+            }
+
+            var deviceConfig =
+                    ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
+
+            //Check for existing asset in GUIDs collection
+
+            FusionAsset tempAsset;
+
+            if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+            {
+                tempAsset = FusionStaticAssets[deviceConfig.Uid];
+            }
+            else
+            {
+                // Create a new asset
+                tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom),
+                    defaultDisplay.Name, "Display", "");
+                FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
+            }
+
+            var dispPowerOnAction = new Action<bool>(b =>
+            {
+                if (!b)
+                {
+                    defaultDisplay.PowerOn();
+                }
+            });
+            var dispPowerOffAction = new Action<bool>(b =>
+            {
+                if (!b)
+                {
+                    defaultDisplay.PowerOff();
+                }
+            });
+
+            var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
+                tempAsset.InstanceId);
+            dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
+            dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
+            defaultDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+            // NO!! display.PowerIsOn.LinkComplementInputSig(dispAsset.PowerOff.InputSig);
+            // Use extension methods
+            dispAsset.TrySetMakeModel(defaultDisplay);
+            dispAsset.TryLinkAssetErrorToCommunication(defaultDisplay);
+        }
+
+        #endregion
+
+        private void codec_CallStatusChange(object sender, Devices.Codec.CodecCallStatusItemChangeEventArgs e)
+        {
+            var codec = _room.VideoCodec;
+
+            _codecIsInCall.InputSig.BoolValue = codec.IsInCall;
+        }
+    }
+}

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

@@ -41,43 +41,43 @@ namespace PepperDash.Essentials.Core.Fusion
 
                         var devProps = JsonConvert.DeserializeObject<RoomOnToDefaultSourceWhenOccupiedConfig>(deviceConfig.Properties.ToString());
 
-                        var enableFeature = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupied"));
+                        var enableFeature = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupied"));
                         if (enableFeature != null)
                             devProps.EnableRoomOnWhenOccupied = bool.Parse(enableFeature.CustomFieldValue);
 
-                        var enableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomOnWhenOccupiedStartTime"));
+                        var enableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("RoomOnWhenOccupiedStartTime"));
                         if (enableTime != null)
                             devProps.OccupancyStartTime = enableTime.CustomFieldValue;
 
-                        var disableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomOnWhenOccupiedEndTime"));
+                        var disableTime = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("RoomOnWhenOccupiedEndTime"));
                         if (disableTime != null)
                             devProps.OccupancyEndTime = disableTime.CustomFieldValue;
 
-                        var enableSunday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedSun"));
+                        var enableSunday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedSun"));
                         if (enableSunday != null)
                             devProps.EnableSunday = bool.Parse(enableSunday.CustomFieldValue);
 
-                        var enableMonday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedMon"));
+                        var enableMonday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedMon"));
                         if (enableMonday != null)
                             devProps.EnableMonday = bool.Parse(enableMonday.CustomFieldValue);
 
-                        var enableTuesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedTue"));
+                        var enableTuesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedTue"));
                         if (enableTuesday != null)
                             devProps.EnableTuesday = bool.Parse(enableTuesday.CustomFieldValue);
 
-                        var enableWednesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedWed"));
+                        var enableWednesday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedWed"));
                         if (enableWednesday != null)
                             devProps.EnableWednesday = bool.Parse(enableWednesday.CustomFieldValue);
 
-                        var enableThursday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedThu"));
+                        var enableThursday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedThu"));
                         if (enableThursday != null)
                             devProps.EnableThursday = bool.Parse(enableThursday.CustomFieldValue);
 
-                        var enableFriday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedFri"));
+                        var enableFriday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedFri"));
                         if (enableFriday != null)
                             devProps.EnableFriday = bool.Parse(enableFriday.CustomFieldValue);
 
-                        var enableSaturday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("EnRoomOnWhenOccupiedSat"));
+                        var enableSaturday = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("EnRoomOnWhenOccupiedSat"));
                         if (enableSaturday != null)
                             devProps.EnableSaturday = bool.Parse(enableSaturday.CustomFieldValue);
 
@@ -96,7 +96,7 @@ namespace PepperDash.Essentials.Core.Fusion
                         }
 
                         // Set the help message
-                        var helpMessage = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomHelpMessage"));
+                        var helpMessage = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.Id.Equals("RoomHelpMessage"));
                         if (helpMessage != null)
                         {
                             //Debug.Console(1, "Current Help Message: {0}. New Help Message: {1}", deviceConfig.Properties["help"]["message"].Value<string>(ToString()), helpMessage.CustomFieldValue);