Merge pull request #598 from PepperDash/hotfix/dge-device-info

Hotfix/dge device info

.gitignore

@@ -388,3 +388,4 @@ MigrationBackup/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
+essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj

PepperDashEssentials/ControlSystem.cs

@@ -432,12 +432,31 @@ namespace PepperDash.Essentials
                 var room = EssentialsRoomConfigHelper.GetRoomObject(roomConfig) as EssentialsRoomBase;
                 if (room != null)
                 {
+                    // default IPID
+                    uint fusionIpId = 0xf1;
+
+                    // default to no join map key
+                    string fusionJoinMapKey = string.Empty;
+
+                    if (room.Config.Properties["fusion"] != null)
+                    {
+                        Debug.Console(2, "Custom Fusion config found. Using custom values");
+
+                        var fusionConfig = room.Config.Properties["fusion"].ToObject<EssentialsRoomFusionConfig>();
+
+                        if (fusionConfig != null)
+                        {
+                            fusionIpId = fusionConfig.IpIdInt;
+                            fusionJoinMapKey = fusionConfig.JoinMapKey;
+                        }
+                    }
+
                     if (room is EssentialsHuddleSpaceRoom)
                     {
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, 0xf1));
+                        DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase(room, fusionIpId, fusionJoinMapKey));
 
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
@@ -449,7 +468,7 @@ namespace PepperDash.Essentials
                         DeviceManager.AddDevice(room);
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
+                        DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge...");
 
@@ -461,7 +480,7 @@ namespace PepperDash.Essentials
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice,
                             "Room is EssentialsTechRoom, Attempting to add to DeviceManager with Fusion");
-                        DeviceManager.AddDevice(new EssentialsHuddleSpaceFusionSystemControllerBase(room, 0xF1));
+                        DeviceManager.AddDevice(new EssentialsTechRoomFusionSystemController((EssentialsTechRoom)room, fusionIpId, fusionJoinMapKey));
 
                         Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to build Mobile Control Bridge");
 
@@ -569,7 +588,7 @@ namespace PepperDash.Essentials
                 return ((logoDark != null && logoDark == "system") ||
                         (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
             }
-            catch (Exception e)
+            catch
             {
                 Debug.Console(1, Debug.ErrorLogLevel.Notice, "Unable to find logo information in any room config");
                 return false;

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -16,8 +16,8 @@ namespace PepperDash.Essentials.Fusion
     {
         BooleanSigData CodecIsInCall;
 
-        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId)
-            : base(room, ipId)
+        public EssentialsHuddleVtc1FusionController(EssentialsHuddleVtc1Room room, uint ipId, string joinMapKey)
+            : base(room, ipId, joinMapKey)
         {
 
         }
@@ -55,25 +55,25 @@ namespace PepperDash.Essentials.Fusion
                 // Map FusionRoom Attributes:
 
                 // Codec volume
-                var codecVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01", eSigIoMask.InputOutputSig);
+                var codecVolume = FusionRoom.CreateOffsetUshortSig(JoinMap.VolumeFader1.JoinNumber, JoinMap.VolumeFader1.AttributeName, 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);
+                CodecIsInCall = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecInCall.JoinNumber, JoinMap.VcCodecInCall.AttributeName, eSigIoMask.InputSigOnly);
                 codec.CallStatusChange += new EventHandler<PepperDash.Essentials.Devices.Common.Codec.CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
                 
                 // Online status
                 if (codec is ICommunicationMonitor)
                 {
                     var c = codec as ICommunicationMonitor;
-                    var codecOnline = FusionRoom.CreateOffsetBoolSig(122, "Online - VC 1", eSigIoMask.InputSigOnly);
+                    var codecOnline = FusionRoom.CreateOffsetBoolSig(JoinMap.VcCodecOnline.JoinNumber, JoinMap.VcCodecOnline.AttributeName, 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");
+                    Debug.Console(0, this, "Linking '{0}' communication monitor to Fusion '{1}'", codec.Key, JoinMap.VcCodecOnline.AttributeName);
                 }
 
                 // Codec IP Address
@@ -101,10 +101,10 @@ namespace PepperDash.Essentials.Fusion
 
                 if (codecHasIpInfo)
                 {
-                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(121, "IP Address - VC", eSigIoMask.InputSigOnly);
+                    codecIpAddressSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpAddress.JoinNumber, JoinMap.VcCodecIpAddress.AttributeName, eSigIoMask.InputSigOnly);
                     codecIpAddressSig.InputSig.StringValue = codecIpAddress;
 
-                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(150, "IP Port - VC", eSigIoMask.InputSigOnly);
+                    codecIpPortSig = FusionRoom.CreateOffsetStringSig(JoinMap.VcCodecIpPort.JoinNumber, JoinMap.VcCodecIpPort.AttributeName, eSigIoMask.InputSigOnly);
                     codecIpPortSig.InputSig.StringValue = codecIpPort.ToString();
                 }
 
@@ -123,7 +123,7 @@ namespace PepperDash.Essentials.Fusion
                     FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
                 }
 
-                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display", tempAsset.InstanceId);
+                var codecAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Codec", tempAsset.InstanceId);
                 codecAsset.PowerOn.OutputSig.UserObject = codecPowerOnAction;
                 codecAsset.PowerOff.OutputSig.UserObject = codecPowerOffAction;
                 codec.StandbyIsOnFeedback.LinkComplementInputSig(codecAsset.PowerOn.InputSig);
@@ -166,20 +166,19 @@ namespace PepperDash.Essentials.Fusion
 
             CrestronConsole.AddNewConsoleCommand(RequestFullRoomSchedule, "FusReqRoomSchedule", "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod", "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting", "Creates and Ad Hoc meeting for on hour or until the next meeting", 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(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 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);
  
 
             CrestronEnvironment.EthernetEventHandler += CrestronEnvironment_EthernetEventHandler;
@@ -197,9 +196,9 @@ namespace PepperDash.Essentials.Fusion
                 uint i = 1;
                 foreach (var kvp in setTopBoxes)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 5) // We only have five spots
+                    if (i > JoinMap.Display1SetTopBoxSourceStart.JoinSpan) // We only have five spots
                         break;
                 }
 
@@ -207,7 +206,7 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in discPlayers)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
                     if (i > 5) // We only have five spots
                         break;
@@ -217,9 +216,9 @@ namespace PepperDash.Essentials.Fusion
                 i = 1;
                 foreach (var kvp in laptops)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + i, JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 10) // We only have ten spots???
+                    if (i > JoinMap.Display1LaptopSourceStart.JoinSpan) // We only have ten spots???
                         break;
                 }
 
@@ -283,7 +282,7 @@ namespace PepperDash.Essentials.Fusion
                 if (defaultDisplay is IDisplayUsage)
                     (defaultDisplay as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
 
-                MapDisplayToRoomJoins(1, 158, defaultDisplay);
+                MapDisplayToRoomJoins(1, JoinMap.Display1Start.JoinNumber, defaultDisplay);
 
                 var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(defaultDisplay.Key));
 
@@ -328,7 +327,7 @@ namespace PepperDash.Essentials.Fusion
 
         }
 
-        protected override void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
+        protected override void MapDisplayToRoomJoins(int displayIndex, uint joinOffset, DisplayBase display)
         {
             string displayName = string.Format("Display {0} - ", displayIndex);
 

PepperDashEssentials/Fusion/EssentialsTechRoomFusionSystemController.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Fusion;
+
+namespace PepperDash.Essentials.Fusion
+{
+    public class EssentialsTechRoomFusionSystemController : EssentialsHuddleSpaceFusionSystemControllerBase
+    {
+        public EssentialsTechRoomFusionSystemController(EssentialsTechRoom room, uint ipId, string joinMapKey)
+            : base(room, ipId, joinMapKey)
+        {
+
+        }
+
+        protected override void SetUpDisplay()
+        {
+            try
+            {
+
+                var displays = (Room as EssentialsTechRoom).Displays;
+
+                Debug.Console(1, this, "Setting up Static Assets for {0} Displays", displays.Count);
+
+                foreach (var display in displays.Values.Cast<DisplayBase>())
+                {
+                    Debug.Console(2, this, "Setting up Static Asset for {0}", display.Key);
+
+                    display.UsageTracker = new UsageTracking(display) { UsageIsTracked = true };
+                    display.UsageTracker.DeviceUsageEnded += UsageTracker_DeviceUsageEnded;
+
+                    var dispPowerOnAction = new Action<bool>(b =>
+                    {
+                        if (!b)
+                        {
+                            display.PowerOn();
+                        }
+                    });
+                    var dispPowerOffAction = new Action<bool>(b =>
+                    {
+                        if (!b)
+                        {
+                            display.PowerOff();
+                        }
+                    });
+
+                    var deviceConfig = ConfigReader.ConfigObject.GetDeviceForKey(display.Key);
+
+                    FusionAsset tempAsset;
+
+                    if (FusionStaticAssets.ContainsKey(deviceConfig.Uid))
+                    {
+                        // Used existing asset
+                        tempAsset = FusionStaticAssets[deviceConfig.Uid];
+                    }
+                    else
+                    {
+                        // Create a new asset
+                        tempAsset = new FusionAsset(FusionRoomGuids.GetNextAvailableAssetNumber(FusionRoom),
+                            display.Name, "Display", "");
+                        FusionStaticAssets.Add(deviceConfig.Uid, tempAsset);
+                    }
+
+                    var dispAsset = FusionRoom.CreateStaticAsset(tempAsset.SlotNumber, tempAsset.Name, "Display",
+                        tempAsset.InstanceId);
+                    dispAsset.PowerOn.OutputSig.UserObject = dispPowerOnAction;
+                    dispAsset.PowerOff.OutputSig.UserObject = dispPowerOffAction;
+
+                    var defaultTwoWayDisplay = display as IHasPowerControlWithFeedback;
+                    if (defaultTwoWayDisplay != null)
+                    {
+                        defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(FusionRoom.DisplayPowerOn.InputSig);
+                        if (display is IDisplayUsage)
+                        {
+                            (display as IDisplayUsage).LampHours.LinkInputSig(FusionRoom.DisplayUsage.InputSig);
+                        }
+
+                        defaultTwoWayDisplay.PowerIsOnFeedback.LinkInputSig(dispAsset.PowerOn.InputSig);
+                    }
+
+                    // Use extension methods
+                    dispAsset.TrySetMakeModel(display);
+                    dispAsset.TryLinkAssetErrorToCommunication(display);
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Error setting up displays in Fusion: {0}", e);
+            }
+        }
+    }
+}

PepperDashEssentials/PepperDashEssentials.csproj

@@ -133,6 +133,7 @@
     <Compile Include="Devices\Amplifier.cs" />
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
+    <Compile Include="Fusion\EssentialsTechRoomFusionSystemController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -177,6 +177,9 @@ namespace PepperDash.Essentials.Room.Config
 		[JsonProperty("volumes")]
 		public EssentialsRoomVolumesConfig Volumes { get; set; }
 
+        [JsonProperty("fusion")]
+        public EssentialsRoomFusionConfig Fusion { get; set; }
+
 		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
@@ -220,6 +223,32 @@ namespace PepperDash.Essentials.Room.Config
 
 	}
 
+    public class EssentialsRoomFusionConfig
+    {
+        public uint IpIdInt
+        {
+            get
+            {
+                try 
+                {
+                    return Convert.ToUInt32(IpId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert IP ID: {0} to hex.  Error:\n{1}", IpId));
+                }
+          
+            }
+        }
+
+        [JsonProperty("ipId")]
+        public string IpId { get; set; }
+
+        [JsonProperty("joinMapKey")]
+        public string JoinMapKey { get; set; }
+
+    }
+
     public class EssentialsRoomMicrophonePrivacyConfig
     {
 		[JsonProperty("deviceKey")]

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -597,12 +597,21 @@ namespace PepperDash.Essentials
                         if (VideoCodec.UsageTracker.InUseTracker.InUseFeedback.BoolValue)
                         {
                             Debug.Console(1, this, "Video Codec in use, deactivating standby on codec");
+                            VideoCodec.StandbyDeactivate();
                         }
 
                         if (VideoCodec.StandbyIsOnFeedback.BoolValue)
                         {
                             VideoCodec.StandbyDeactivate();
                         }
+                        else
+                        {
+                            Debug.Console(1, this, "Video codec not in standby. No need to wake.");
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Room OnFeedback state: {0}", OnFeedback.BoolValue);
                     }
 
                     // report back when done

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -47,7 +47,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <param name="joinStart">Join this join map will start at</param>
         /// <param name="type">Type of the child join map</param>
         public AppleTvJoinMap(uint joinStart, Type type) : base(joinStart, type)
-    {
-    }
+        {
+        }
     }
 }

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

@@ -7,6 +7,8 @@ using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
+using Newtonsoft.Json.Linq;
+
 namespace PepperDash.Essentials.Core.Config
 {
 	/// <summary>
@@ -27,7 +29,7 @@ namespace PepperDash.Essentials.Core.Config
 		public List<TieLineConfig> TieLines { get; set; }
 
         [JsonProperty("joinMaps")]
-        public Dictionary<string, string> JoinMaps { get; set; }
+        public Dictionary<string, JObject> JoinMaps { get; set; }
 
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null

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

@@ -1,195 +1,195 @@
-using System;
+using System;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Core.Config;
-
-namespace PepperDash.Essentials.Core.Config
-{
-	/// <summary>
-	/// Loads the ConfigObject from the file
-	/// </summary>
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Core.Config;
+
+namespace PepperDash.Essentials.Core.Config
+{
+	/// <summary>
+	/// Loads the ConfigObject from the file
+	/// </summary>
 	public class ConfigReader
 	{
 	    public const string LocalConfigPresent =
             @"
 ***************************************************
 ************* Using Local config file *************
-***************************************************";
-
-		public static EssentialsConfig ConfigObject { get; private set; }
-
-		public static bool LoadConfig2()
-		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
-			try
-			{
-                // Check for local config file first
-                var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
-
-                bool localConfigFound = false;
-
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
-
-                // Check for local config directory first
-
-                var configFiles = GetConfigFiles(filePath);
-
-                if (configFiles != null)
-                {
-                    if (configFiles.Length > 1)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                            "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
-                        return false;
-                    }
-                    if(configFiles.Length == 1)
-                    {
+***************************************************";
+
+		public static EssentialsConfig ConfigObject { get; private set; }
+
+		public static bool LoadConfig2()
+		{
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading unmerged system/template portal configuration file.");
+			try
+			{
+                // Check for local config file first
+                var filePath = Global.FilePathPrefix + ConfigWriter.LocalConfigFolder + Global.DirectorySeparator + Global.ConfigFileName;
+
+                bool localConfigFound = false;
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Local config file: '{0}'", filePath);
+
+                // Check for local config directory first
+
+                var configFiles = GetConfigFiles(filePath);
+
+                if (configFiles != null)
+                {
+                    if (configFiles.Length > 1)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                            "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
+                        return false;
+                    }
+                    if(configFiles.Length == 1)
+                    {
                         localConfigFound = true;
-                        
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                        "Local Configuration file not present.", filePath);
-
-                }
-
-                // Check for Portal Config
-                if(!localConfigFound)
-                {
-                    filePath = Global.FilePathPrefix + Global.ConfigFileName;
-
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
-
-                    configFiles = GetConfigFiles(filePath);
-
-                    if (configFiles != null)
-                    {
-                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
-
-                        if (configFiles.Length > 1)
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Error,
-                                "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
-                            return false;
-                        }
-                        else if (configFiles.Length == 1)
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
-                        }
-                        else
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error,
-                            "ERROR: Portal Configuration file not present. Please load file and reset program.");
-                        return false;
-                    }
-                }
-
-                // Get the actual file path
+                        
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                        "Local Configuration file not present.", filePath);
+
+                }
+
+                // Check for Portal Config
+                if(!localConfigFound)
+                {
+                    filePath = Global.FilePathPrefix + Global.ConfigFileName;
+
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to load Portal config file: '{0}'", filePath);
+
+                    configFiles = GetConfigFiles(filePath);
+
+                    if (configFiles != null)
+                    {
+                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
+
+                        if (configFiles.Length > 1)
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Error,
+                                "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
+                            return false;
+                        }
+                        else if (configFiles.Length == 1)
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
+                        }
+                        else
+                        {
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error,
+                            "ERROR: Portal Configuration file not present. Please load file and reset program.");
+                        return false;
+                    }
+                }
+
+                // Get the actual file path
                 filePath = configFiles[0].FullName;
 
                 // Generate debug statement if using a local file.
 			    if (localConfigFound)
 			    {
                     GetLocalFileMessage(filePath);
-			    }
-
-                // Read the file
-                using (StreamReader fs = new StreamReader(filePath))
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
-
-                    if (localConfigFound)
-                    {
-                        ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
-
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
-
-                        return true;
-                    }
-                    else
-                    {
-                        var doubleObj = JObject.Parse(fs.ReadToEnd());
-                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
-
-                        // Extract SystemUrl and TemplateUrl into final config output
-
-                        if (doubleObj["system_url"] != null)
-                        {
-                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
-                        }
-
-                        if (doubleObj["template_url"] != null)
-                        {
-                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
-                        }
-                    }
-
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
-
-                    return true;
-                }
-			}
-			catch (Exception e)
-			{
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
-				return false;
-			}
-		}
-
-        /// <summary>
-        /// Returns all the files from the directory specified.
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        public static FileInfo[] GetConfigFiles(string filePath)
-        {
-            // Get the directory
-            var dir = Path.GetDirectoryName(filePath);
-
-            if (Directory.Exists(dir))
-            {
-                Debug.Console(1, "Searching in Directory '{0}'", dir);
-                // Get the directory info
-                var dirInfo = new DirectoryInfo(dir);
-
-                // Get the file name
-                var fileName = Path.GetFileName(filePath);
-                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
-
-                // Get the files that match from the directory
-                return dirInfo.GetFiles(fileName);
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice,
-                    "Directory not found: ", dir);
-
-                return null;
-            }
-        }
-
-		/// <summary>
-		/// Returns the group for a given device key in config
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-        public static string GetGroupForDeviceKey(string key)
-        {
-            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-            return dev == null ? null : dev.Group;
+			    }
+
+                // Read the file
+                using (StreamReader fs = new StreamReader(filePath))
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading config file: '{0}'", filePath);
+
+                    if (localConfigFound)
+                    {
+                        ConfigObject = JObject.Parse(fs.ReadToEnd()).ToObject<EssentialsConfig>();
+
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Local Config");
+
+                        return true;
+                    }
+                    else
+                    {
+                        var doubleObj = JObject.Parse(fs.ReadToEnd());
+                        ConfigObject = PortalConfigReader.MergeConfigs(doubleObj).ToObject<EssentialsConfig>();
+
+                        // Extract SystemUrl and TemplateUrl into final config output
+
+                        if (doubleObj["system_url"] != null)
+                        {
+                            ConfigObject.SystemUrl = doubleObj["system_url"].Value<string>();
+                        }
+
+                        if (doubleObj["template_url"] != null)
+                        {
+                            ConfigObject.TemplateUrl = doubleObj["template_url"].Value<string>();
+                        }
+                    }
+
+                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Successfully Loaded Merged Config");
+
+                    return true;
+                }
+			}
+			catch (Exception e)
+			{
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "ERROR: Config load failed: \r{0}", e);
+				return false;
+			}
+		}
+
+        /// <summary>
+        /// Returns all the files from the directory specified.
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
+        public static FileInfo[] GetConfigFiles(string filePath)
+        {
+            // Get the directory
+            var dir = Path.GetDirectoryName(filePath);
+
+            if (Directory.Exists(dir))
+            {
+                Debug.Console(1, "Searching in Directory '{0}'", dir);
+                // Get the directory info
+                var dirInfo = new DirectoryInfo(dir);
+
+                // Get the file name
+                var fileName = Path.GetFileName(filePath);
+                Debug.Console(1, "For Config Files matching: '{0}'", fileName);
+
+                // Get the files that match from the directory
+                return dirInfo.GetFiles(fileName);
+            }
+            else
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice,
+                    "Directory not found: ", dir);
+
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Returns the group for a given device key in config
+		/// </summary>
+		/// <param name="key"></param>
+		/// <returns></returns>
+        public static string GetGroupForDeviceKey(string key)
+        {
+            var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+            return dev == null ? null : dev.Group;
         }
 
 	    private static void GetLocalFileMessage(string filePath)
@@ -248,7 +248,7 @@ namespace PepperDash.Essentials.Core.Config
 
             Debug.Console(2, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
             Debug.Console(0, newDebugString.ToString());
-	    }
-
-	}
+	    }
+
+	}
 }

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

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		bool HasDpad { get; }
 
-		PepperDash.Essentials.Core.Presets.DevicePresetsModel PresetsModel { get; }
+		PepperDash.Essentials.Core.Presets.DevicePresetsModel TvPresets { get; }
 		void LoadPresets(string filePath);
 
 		void DvrList(bool pressRelease);

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

@@ -16,6 +16,8 @@ namespace PepperDash.Essentials.Core.Fusion
 {
     public class EssentialsHuddleSpaceFusionSystemControllerBase : Device, IOccupancyStatusProvider
     {
+        protected EssentialsHuddleSpaceRoomFusionRoomJoinMap JoinMap;
+
         private const string RemoteOccupancyXml = "<Occupancy><Type>Local</Type><State>{0}</State></Occupancy>";
         private readonly bool _guidFileExists;
 
@@ -84,11 +86,24 @@ namespace PepperDash.Essentials.Core.Fusion
 
         #endregion
 
-        public EssentialsHuddleSpaceFusionSystemControllerBase(EssentialsRoomBase room, uint ipId)
+        public EssentialsHuddleSpaceFusionSystemControllerBase(EssentialsRoomBase room, uint ipId, string joinMapKey)
             : base(room.Key + "-fusion")
         {
             try
             {
+                JoinMap = new EssentialsHuddleSpaceRoomFusionRoomJoinMap(1);
+
+                CrestronConsole.AddNewConsoleCommand((o) => JoinMap.PrintJoinMapInfo(), string.Format("ptjnmp-{0}", Key), "Prints Attribute Join Map", ConsoleAccessLevelEnum.AccessOperator);
+
+                if (!string.IsNullOrEmpty(joinMapKey))
+                {
+                    var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
+                    if (customJoins != null)
+                    {
+                        JoinMap.SetCustomJoinData(customJoins);
+                    }
+                }
+                 
                 Room = room;
 
                 _ipId = ipId;
@@ -319,7 +334,7 @@ namespace PepperDash.Essentials.Core.Fusion
                 "Requests schedule of the room for the next 24 hours", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(ModifyMeetingEndTimeConsoleHelper, "FusReqRoomSchMod",
                 "Ends or extends a meeting by the specified time", ConsoleAccessLevelEnum.AccessOperator);
-            CrestronConsole.AddNewConsoleCommand(CreateAsHocMeeting, "FusCreateMeeting",
+            CrestronConsole.AddNewConsoleCommand(CreateAdHocMeeting, "FusCreateMeeting",
                 "Creates and Ad Hoc meeting for on hour or until the next meeting",
                 ConsoleAccessLevelEnum.AccessOperator);
 
@@ -327,7 +342,7 @@ namespace PepperDash.Essentials.Core.Fusion
             Room.OnFeedback.LinkInputSig(FusionRoom.SystemPowerOn.InputSig);
 
             // Moved to 
-            CurrentRoomSourceNameSig = FusionRoom.CreateOffsetStringSig(84, "Display 1 - Current Source",
+            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. 
             var hasCurrentSourceInfoChange = Room as IHasCurrentSourceInfoChange;
@@ -377,24 +392,24 @@ namespace PepperDash.Essentials.Core.Fusion
 
             var response = string.Empty;
 
-            var systemReboot = FusionRoom.CreateOffsetBoolSig(74, "Processor - Reboot", eSigIoMask.OutputSigOnly);
+            var systemReboot = FusionRoom.CreateOffsetBoolSig(JoinMap.ProcessorReboot.JoinNumber, JoinMap.ProcessorReboot.AttributeName, eSigIoMask.OutputSigOnly);
             systemReboot.OutputSig.SetSigFalseAction(
                 () => CrestronConsole.SendControlSystemCommand("reboot", ref response));
         }
 
         protected void SetUpEthernetValues()
         {
-            _ip1 = FusionRoom.CreateOffsetStringSig(50, "Info - Processor - IP 1", eSigIoMask.InputSigOnly);
-            _ip2 = FusionRoom.CreateOffsetStringSig(51, "Info - Processor - IP 2", eSigIoMask.InputSigOnly);
-            _gateway = FusionRoom.CreateOffsetStringSig(52, "Info - Processor - Gateway", eSigIoMask.InputSigOnly);
-            _hostname = FusionRoom.CreateOffsetStringSig(53, "Info - Processor - Hostname", eSigIoMask.InputSigOnly);
-            _domain = FusionRoom.CreateOffsetStringSig(54, "Info - Processor - Domain", eSigIoMask.InputSigOnly);
-            _dns1 = FusionRoom.CreateOffsetStringSig(55, "Info - Processor - DNS 1", eSigIoMask.InputSigOnly);
-            _dns2 = FusionRoom.CreateOffsetStringSig(56, "Info - Processor - DNS 2", eSigIoMask.InputSigOnly);
-            _mac1 = FusionRoom.CreateOffsetStringSig(57, "Info - Processor - MAC 1", eSigIoMask.InputSigOnly);
-            _mac2 = FusionRoom.CreateOffsetStringSig(58, "Info - Processor - MAC 2", eSigIoMask.InputSigOnly);
-            _netMask1 = FusionRoom.CreateOffsetStringSig(59, "Info - Processor - Net Mask 1", eSigIoMask.InputSigOnly);
-            _netMask2 = FusionRoom.CreateOffsetStringSig(60, "Info - Processor - Net Mask 2", eSigIoMask.InputSigOnly);
+            _ip1 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorIp1.JoinNumber, JoinMap.ProcessorIp1.AttributeName, eSigIoMask.InputSigOnly);
+            _ip2 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorIp2.JoinNumber, JoinMap.ProcessorIp2.AttributeName, eSigIoMask.InputSigOnly);
+            _gateway = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorGateway.JoinNumber, JoinMap.ProcessorGateway.AttributeName, eSigIoMask.InputSigOnly);
+            _hostname = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorHostname.JoinNumber, JoinMap.ProcessorHostname.AttributeName, eSigIoMask.InputSigOnly);
+            _domain = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorDomain.JoinNumber, JoinMap.ProcessorDomain.AttributeName, eSigIoMask.InputSigOnly);
+            _dns1 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorDns1.JoinNumber, JoinMap.ProcessorDns1.AttributeName, eSigIoMask.InputSigOnly);
+            _dns2 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorDns2.JoinNumber, JoinMap.ProcessorDns2.AttributeName, eSigIoMask.InputSigOnly);
+            _mac1 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorMac1.JoinNumber, JoinMap.ProcessorMac1.AttributeName, eSigIoMask.InputSigOnly);
+            _mac2 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorMac2.JoinNumber, JoinMap.ProcessorMac2.AttributeName, eSigIoMask.InputSigOnly);
+            _netMask1 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorNetMask1.JoinNumber, JoinMap.ProcessorNetMask1.AttributeName, eSigIoMask.InputSigOnly);
+            _netMask2 = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorNetMask2.JoinNumber, JoinMap.ProcessorNetMask2.AttributeName, eSigIoMask.InputSigOnly);
         }
 
         protected void GetProcessorEthernetValues()
@@ -447,16 +462,16 @@ namespace PepperDash.Essentials.Core.Fusion
 
         protected void GetProcessorInfo()
         {
-            _firmware = FusionRoom.CreateOffsetStringSig(61, "Info - Processor - Firmware", eSigIoMask.InputSigOnly);
+            _firmware = FusionRoom.CreateOffsetStringSig(JoinMap.ProcessorFirmware.JoinNumber, JoinMap.ProcessorFirmware.AttributeName, eSigIoMask.InputSigOnly);
 
             if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server)
             {
                 for (var i = 0; i < Global.ControlSystem.NumProgramsSupported; i++)
                 {
-                    var join = 62 + i;
+                    var join = JoinMap.ProgramNameStart.JoinNumber + i;
                     var progNum = i + 1;
                     _program[i] = FusionRoom.CreateOffsetStringSig((uint) join,
-                        string.Format("Info - Processor - Program {0}", progNum), eSigIoMask.InputSigOnly);
+                        string.Format("{0} {1}", JoinMap.ProgramNameStart.AttributeName, progNum), eSigIoMask.InputSigOnly);
                 }
             }
 
@@ -484,57 +499,60 @@ namespace PepperDash.Essentials.Core.Fusion
         {
             if (args.DeviceOnLine)
             {
-                CrestronEnvironment.Sleep(200);
-
-                // Send Push Notification Action request:
-
-                const string requestId = "InitialPushRequest";
-
-
-                var actionRequest =
-                    string.Format("<RequestAction>\n<RequestID>{0}</RequestID>\n", requestId) +
-                    "<ActionID>RegisterPushModel</ActionID>\n" +
-                    "<Parameters>\n" +
-                    "<Parameter ID='Enabled' Value='1' />\n" +
-                    "<Parameter ID='RequestID' Value='PushNotification' />\n" +
-                    "<Parameter ID='Start' Value='00:00:00' />\n" +
-                    "<Parameter ID='HourSpan' Value='24' />\n" +
-                    "<Parameter ID='Field' Value='MeetingID' />\n" +
-                    "<Parameter ID='Field' Value='RVMeetingID' />\n" +
-                    "<Parameter ID='Field' Value='InstanceID' />\n" +
-                    "<Parameter ID='Field' Value='dtStart' />\n" +
-                    "<Parameter ID='Field' Value='dtEnd' />\n" +
-                    "<Parameter ID='Field' Value='Subject' />\n" +
-                    "<Parameter ID='Field' Value='Organizer' />\n" +
-                    "<Parameter ID='Field' Value='IsEvent' />\n" +
-                    "<Parameter ID='Field' Value='IsPrivate' />\n" +
-                    "<Parameter ID='Field' Value='IsExchangePrivate' />\n" +
-                    "<Parameter ID='Field' Value='LiveMeeting' />\n" +
-                    "<Parameter ID='Field' Value='ShareDocPath' />\n" +
-                    "<Parameter ID='Field' Value='PhoneNo' />\n" +
-                    "<Parameter ID='Field' Value='ParticipantCode' />\n" +
-                    "</Parameters>\n" +
-                    "</RequestAction>\n";
-
-                Debug.Console(2, this, "Sending Fusion ActionRequest: \n{0}", actionRequest);
-
-                FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQuery.StringValue = actionRequest;
-
-                GetCustomProperties();
-
-                // Request current Fusion Server Time
-                RequestLocalDateTime(null);
-
-                // Setup timer to request time daily
-                if (_dailyTimeRequestTimer != null && !_dailyTimeRequestTimer.Disposed)
+                CrestronInvoke.BeginInvoke( (o) => 
                 {
-                    _dailyTimeRequestTimer.Stop();
-                    _dailyTimeRequestTimer.Dispose();
-                }
+                    CrestronEnvironment.Sleep(200);
 
-                _dailyTimeRequestTimer = new CTimer(RequestLocalDateTime, null, 86400000, 86400000);
+                    // Send Push Notification Action request:
 
-                _dailyTimeRequestTimer.Reset(86400000, 86400000);
+                    const string requestId = "InitialPushRequest";
+
+
+                    var actionRequest =
+                        string.Format("<RequestAction>\n<RequestID>{0}</RequestID>\n", requestId) +
+                        "<ActionID>RegisterPushModel</ActionID>\n" +
+                        "<Parameters>\n" +
+                        "<Parameter ID='Enabled' Value='1' />\n" +
+                        "<Parameter ID='RequestID' Value='PushNotification' />\n" +
+                        "<Parameter ID='Start' Value='00:00:00' />\n" +
+                        "<Parameter ID='HourSpan' Value='24' />\n" +
+                        "<Parameter ID='Field' Value='MeetingID' />\n" +
+                        "<Parameter ID='Field' Value='RVMeetingID' />\n" +
+                        "<Parameter ID='Field' Value='InstanceID' />\n" +
+                        "<Parameter ID='Field' Value='dtStart' />\n" +
+                        "<Parameter ID='Field' Value='dtEnd' />\n" +
+                        "<Parameter ID='Field' Value='Subject' />\n" +
+                        "<Parameter ID='Field' Value='Organizer' />\n" +
+                        "<Parameter ID='Field' Value='IsEvent' />\n" +
+                        "<Parameter ID='Field' Value='IsPrivate' />\n" +
+                        "<Parameter ID='Field' Value='IsExchangePrivate' />\n" +
+                        "<Parameter ID='Field' Value='LiveMeeting' />\n" +
+                        "<Parameter ID='Field' Value='ShareDocPath' />\n" +
+                        "<Parameter ID='Field' Value='PhoneNo' />\n" +
+                        "<Parameter ID='Field' Value='ParticipantCode' />\n" +
+                        "</Parameters>\n" +
+                        "</RequestAction>\n";
+
+                    Debug.Console(2, this, "Sending Fusion ActionRequest: \n{0}", actionRequest);
+
+                    FusionRoom.ExtenderFusionRoomDataReservedSigs.ActionQuery.StringValue = actionRequest;
+
+                    GetCustomProperties();
+
+                    // Request current Fusion Server Time
+                    RequestLocalDateTime(null);
+
+                    // Setup timer to request time daily
+                    if (_dailyTimeRequestTimer != null && !_dailyTimeRequestTimer.Disposed)
+                    {
+                        _dailyTimeRequestTimer.Stop();
+                        _dailyTimeRequestTimer.Dispose();
+                    }
+
+                    _dailyTimeRequestTimer = new CTimer(RequestLocalDateTime, null, 86400000, 86400000);
+
+                    _dailyTimeRequestTimer.Reset(86400000, 86400000);
+                });
             }
         }
 
@@ -641,7 +659,7 @@ namespace PepperDash.Essentials.Core.Fusion
         /// <summary>
         /// Creates and Ad Hoc meeting with a duration of 1 hour, or until the next meeting if in less than 1 hour.
         /// </summary>
-        public void CreateAsHocMeeting(string command)
+        public void CreateAdHocMeeting(string command)
         {
             const string requestId = "CreateAdHocMeeting";
 
@@ -1031,9 +1049,9 @@ namespace PepperDash.Essentials.Core.Fusion
                 uint i = 1;
                 foreach (var kvp in setTopBoxes)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source TV " + i, 188 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1SetTopBoxSourceStart.AttributeName + " " + i, JoinMap.Display1SetTopBoxSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 5) // We only have five spots
+                    if (i > JoinMap.Display1SetTopBoxSourceStart.JoinSpan) // We only have five spots
                     {
                         break;
                     }
@@ -1043,9 +1061,9 @@ namespace PepperDash.Essentials.Core.Fusion
                 i = 1;
                 foreach (var kvp in discPlayers)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source DVD " + i, 181 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1DiscPlayerSourceStart.AttributeName + " " + i, JoinMap.Display1DiscPlayerSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 5) // We only have five spots
+                    if (i > JoinMap.Display1DiscPlayerSourceStart.JoinSpan) // We only have five spots
                     {
                         break;
                     }
@@ -1055,9 +1073,9 @@ namespace PepperDash.Essentials.Core.Fusion
                 i = 1;
                 foreach (var kvp in laptops)
                 {
-                    TryAddRouteActionSigs("Display 1 - Source Laptop " + i, 166 + i, kvp.Key, kvp.Value.SourceDevice);
+                    TryAddRouteActionSigs(JoinMap.Display1LaptopSourceStart.AttributeName + " " + i, JoinMap.Display1LaptopSourceStart.JoinNumber + i, kvp.Key, kvp.Value.SourceDevice);
                     i++;
-                    if (i > 10) // We only have ten spots???
+                    if (i > JoinMap.Display1LaptopSourceStart.JoinSpan) // We only have ten spots???
                     {
                         break;
                     }
@@ -1180,12 +1198,12 @@ namespace PepperDash.Essentials.Core.Fusion
                     {
                         attrNum = attrNum + touchpanelNum;
 
-                        if (attrNum > 10)
+                        if (attrNum > JoinMap.XpanelOnlineStart.JoinSpan)
                         {
                             continue;
                         }
-                        attrName = "Online - XPanel " + attrNum;
-                        attrNum += 160;
+                        attrName = JoinMap.XpanelOnlineStart.AttributeName + " " + attrNum;
+                        attrNum += JoinMap.XpanelOnlineStart.JoinNumber;
 
                         touchpanelNum++;
                     }
@@ -1193,12 +1211,12 @@ namespace PepperDash.Essentials.Core.Fusion
                     {
                         attrNum = attrNum + xpanelNum;
 
-                        if (attrNum > 10)
+                        if (attrNum > JoinMap.TouchpanelOnlineStart.JoinSpan)
                         {
                             continue;
                         }
-                        attrName = "Online - Touch Panel " + attrNum;
-                        attrNum += 150;
+                        attrName = JoinMap.TouchpanelOnlineStart.AttributeName + " " + attrNum;
+                        attrNum += JoinMap.TouchpanelOnlineStart.JoinNumber;
 
                         xpanelNum++;
                     }
@@ -1208,12 +1226,12 @@ namespace PepperDash.Essentials.Core.Fusion
                 if (dev is DisplayBase)
                 {
                     attrNum = attrNum + displayNum;
-                    if (attrNum > 10)
+                    if (attrNum > JoinMap.DisplayOnlineStart.JoinSpan)
                     {
                         continue;
                     }
-                    attrName = "Online - Display " + attrNum;
-                    attrNum += 170;
+                    attrName = JoinMap.DisplayOnlineStart.AttributeName + " " + attrNum;
+                    attrNum += JoinMap.DisplayOnlineStart.JoinNumber;
 
                     displayNum++;
                 }
@@ -1290,7 +1308,7 @@ namespace PepperDash.Essentials.Core.Fusion
                 FusionRoom.DisplayPowerOn.OutputSig.UserObject = dispPowerOnAction;
                 FusionRoom.DisplayPowerOff.OutputSig.UserObject = dispPowerOffAction;
 
-                MapDisplayToRoomJoins(1, 158, defaultDisplay);
+                MapDisplayToRoomJoins(1, JoinMap.Display1Start.JoinNumber, defaultDisplay);
 
 
                 var deviceConfig =
@@ -1346,7 +1364,7 @@ namespace PepperDash.Essentials.Core.Fusion
         /// <param name="display"></param>
         /// <param name="displayIndex"></param>
         /// a
-        protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
+        protected virtual void MapDisplayToRoomJoins(int displayIndex, uint joinOffset, DisplayBase display)
         {
             var displayName = string.Format("Display {0} - ", displayIndex);
 
@@ -1357,7 +1375,7 @@ namespace PepperDash.Essentials.Core.Fusion
                 return;
             }
             // Display volume
-            var defaultDisplayVolume = FusionRoom.CreateOffsetUshortSig(50, "Volume - Fader01",
+            var defaultDisplayVolume = FusionRoom.CreateOffsetUshortSig(JoinMap.VolumeFader1.JoinNumber, JoinMap.VolumeFader1.AttributeName,
                 eSigIoMask.InputOutputSig);
             defaultDisplayVolume.OutputSig.UserObject = new Action<ushort>(b =>
             {

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

@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Essentials.Core.Bridges;
+
+
+namespace PepperDash.Essentials.Core.Fusion
+{
+    public class EssentialsHuddleSpaceRoomFusionRoomJoinMap : JoinMapBaseAdvanced
+    {
+
+        // Processor Attributes
+        [JoinName("ProcessorIp1")]
+        public JoinDataComplete ProcessorIp1 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1, AttributeName = "Info - Processor - IP 1" },
+            new JoinMetadata { Description = "Info - Processor - IP 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorIp2")]
+        public JoinDataComplete ProcessorIp2 = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1, AttributeName = "Info - Processor - IP 2" },
+            new JoinMetadata { Description = "Info - Processor - IP 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorGateway")]
+        public JoinDataComplete ProcessorGateway = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1, AttributeName = "Info - Processor - Gateway" },
+            new JoinMetadata { Description = "Info - Processor - Gateway", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorHostname")]
+        public JoinDataComplete ProcessorHostname = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1, AttributeName = "Info - Processor - Hostname" },
+            new JoinMetadata { Description = "Info - Processor - Hostname", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorDomain")]
+        public JoinDataComplete ProcessorDomain = new JoinDataComplete(new JoinData { JoinNumber = 54, JoinSpan = 1, AttributeName = "Info - Processor - Domain" },
+            new JoinMetadata { Description = "Info - Processor - Domain", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorDns1")]
+        public JoinDataComplete ProcessorDns1 = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1, AttributeName = "Info - Processor - DNS 1" },
+            new JoinMetadata { Description = "Info - Processor - DNS 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorDns2")]
+        public JoinDataComplete ProcessorDns2 = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1, AttributeName = "Info - Processor - DNS 2" },
+            new JoinMetadata { Description = "Info - Processor - DNS 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorMac1")]
+        public JoinDataComplete ProcessorMac1 = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1, AttributeName = "Info - Processor - MAC 1" },
+            new JoinMetadata { Description = "Info - Processor - MAC 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorMac2")]
+        public JoinDataComplete ProcessorMac2 = new JoinDataComplete(new JoinData { JoinNumber = 58, JoinSpan = 1, AttributeName = "Info - Processor - MAC 2" },
+            new JoinMetadata { Description = "Info - Processor - MAC 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorNetMask1")]
+        public JoinDataComplete ProcessorNetMask1 = new JoinDataComplete(new JoinData { JoinNumber = 59, JoinSpan = 1, AttributeName = "Info - Processor - Net Mask 1" },
+            new JoinMetadata { Description = "Info - Processor - Net Mask 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorNetMask2")]
+        public JoinDataComplete ProcessorNetMask2 = new JoinDataComplete(new JoinData { JoinNumber = 60, JoinSpan = 1, AttributeName = "Info - Processor - Net Mask 2" },
+            new JoinMetadata { Description = "Info - Processor - Net Mask 2", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorFirmware")]
+        public JoinDataComplete ProcessorFirmware = new JoinDataComplete(new JoinData { JoinNumber = 61, JoinSpan = 1, AttributeName = "Info - Processor - Firmware" },
+            new JoinMetadata { Description = "Info - Processor - Firmware", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProgramNameStart")]
+        public JoinDataComplete ProgramNameStart = new JoinDataComplete(new JoinData { JoinNumber = 62, JoinSpan = 10, AttributeName = "Info - Processor - Program" },
+            new JoinMetadata { Description = "Info - Processor - Program", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("ProcessorReboot")]
+        public JoinDataComplete ProcessorReboot = new JoinDataComplete(new JoinData { JoinNumber = 74, JoinSpan = 1, AttributeName = "Processor - Reboot" },
+            new JoinMetadata { Description = "Processor - Reboot", JoinCapabilities = eJoinCapabilities.FromFusion, JoinType = eJoinType.Digital });
+
+        // Volume Controls
+        [JoinName("VolumeFader1")]
+        public JoinDataComplete VolumeFader1 = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1, AttributeName = "Volume - Fader01" },
+            new JoinMetadata { Description = "Volume - Fader01", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Analog });
+
+        // Codec Info
+        [JoinName("VcCodecInCall")]
+        public JoinDataComplete VcCodecInCall = new JoinDataComplete(new JoinData { JoinNumber = 69, JoinSpan = 1, AttributeName = "Conf - VC 1 In Call" },
+            new JoinMetadata { Description = "Conf - VC 1 In Call", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("VcCodecOnline")]
+        public JoinDataComplete VcCodecOnline = new JoinDataComplete(new JoinData { JoinNumber = 122, JoinSpan = 1, AttributeName = "Online - VC 1" },
+            new JoinMetadata { Description = "Online - VC 1", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("VcCodecIpAddress")]
+        public JoinDataComplete VcCodecIpAddress = new JoinDataComplete(new JoinData { JoinNumber = 121, JoinSpan = 1, AttributeName = "IP Address - VC" },
+            new JoinMetadata { Description = "IP Address - VC", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        [JoinName("VcCodecIpPort")]
+        public JoinDataComplete VcCodecIpPort = new JoinDataComplete(new JoinData { JoinNumber = 150, JoinSpan = 1, AttributeName = "IP Port - VC" },
+            new JoinMetadata { Description = "IP Port - VC", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+        // Source Attributes 
+        [JoinName("Display1CurrentSourceName")]
+        public JoinDataComplete Display1CurrentSourceName = new JoinDataComplete(new JoinData { JoinNumber = 84, JoinSpan = 1, AttributeName = "Display 1 - Current Source" },
+            new JoinMetadata { Description = "Display 1 - Current Source", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Serial });
+
+
+        // Device Online Status
+        [JoinName("TouchpanelOnlineStart")]
+        public JoinDataComplete TouchpanelOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 150, JoinSpan = 10, AttributeName = "Online - Touch Panel" },
+            new JoinMetadata { Description = "Online - Touch Panel", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("XpanelOnlineStart")]
+        public JoinDataComplete XpanelOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 160, JoinSpan = 5, AttributeName = "Online - XPanel" },
+            new JoinMetadata { Description = "Online - XPanel", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("DisplayOnlineStart")]
+        public JoinDataComplete DisplayOnlineStart = new JoinDataComplete(new JoinData { JoinNumber = 170, JoinSpan = 10, AttributeName = "Online - Display" },
+            new JoinMetadata { Description = "Online - Display", JoinCapabilities = eJoinCapabilities.ToFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("Display1LaptopSourceStart")]
+        public JoinDataComplete Display1LaptopSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 166, JoinSpan = 5, AttributeName = "Display 1 - Source Laptop" },
+            new JoinMetadata { Description = "Display 1 - Source Laptop", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+        
+        [JoinName("Display1DiscPlayerSourceStart")]
+        public JoinDataComplete Display1DiscPlayerSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 181, JoinSpan = 5, AttributeName = "Display 1 - Source Disc Player" },
+            new JoinMetadata { Description = "Display 1 - Source Disc Player", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+
+        [JoinName("Display1SetTopBoxSourceStart")]
+        public JoinDataComplete Display1SetTopBoxSourceStart = new JoinDataComplete(new JoinData { JoinNumber = 188, JoinSpan = 5, AttributeName = "Display 1 - Source TV" },
+            new JoinMetadata { Description = "Display 1 - Source TV", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+
+        // Display 1 
+        [JoinName("Display1Start")]
+        public JoinDataComplete Display1Start = new JoinDataComplete(new JoinData { JoinNumber = 158, JoinSpan = 1 },
+            new JoinMetadata { Description = "Display 1 Start", JoinCapabilities = eJoinCapabilities.ToFromFusion, JoinType = eJoinType.Digital });
+
+
+        /// <summary>
+        /// Constructor to use when instantiating this Join Map without inheriting from it
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        public EssentialsHuddleSpaceRoomFusionRoomJoinMap(uint joinStart)
+            : base(joinStart, typeof(EssentialsHuddleSpaceRoomFusionRoomJoinMap))
+        {
+
+        }
+
+        /// <summary>
+        /// Constructor to use when extending this Join map
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        /// <param name="type">Type of the child join map</param>
+        public EssentialsHuddleSpaceRoomFusionRoomJoinMap(uint joinStart, Type type) : base(joinStart, type)
+        {
+        }
+    }   
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs

@@ -25,7 +25,7 @@ namespace PepperDash.Essentials.Core
 
             var joinMap = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
 
-            return joinMap;
+            return joinMap.ToString();
         }
 
         /// <summary>
@@ -45,16 +45,33 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static Dictionary<string, JoinData> TryGetJoinMapAdvancedForDevice(string joinMapKey)
         {
-            if (string.IsNullOrEmpty(joinMapKey))
+            try
+            {
+                if (string.IsNullOrEmpty(joinMapKey))
+                    return null;
+
+                if (!ConfigReader.ConfigObject.JoinMaps.ContainsKey(joinMapKey))
+                {
+                    Debug.Console(2, "No Join Map found in config with key: '{0}'", joinMapKey);
+                    return null;
+                }
+
+                Debug.Console(2, "Attempting to load custom join map with key: {0}", joinMapKey);
+
+                var joinMapJToken = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
+
+                if (joinMapJToken == null)
+                    return null;
+
+                var joinMapData = joinMapJToken.ToObject<Dictionary<string, JoinData>>();
+
+                return joinMapData;
+            }
+            catch (Exception e)
+            {
+                Debug.Console(2, "Error getting join map for key: '{0}'.  Error: {1}", joinMapKey, e);
                 return null;
-
-            var joinMapSerialzed = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
-
-            if (joinMapSerialzed == null) return null;
-
-            var joinMapData = JsonConvert.DeserializeObject<Dictionary<string, JoinData>>(joinMapSerialzed);
-
-            return joinMapData;
+            }
         }
 
     }
@@ -266,7 +283,7 @@ namespace PepperDash.Essentials.Core
                     @"Join Number: {0} | JoinSpan: '{1}' | Description: '{2}' | Type: '{3}' | Capabilities: '{4}'",
                         join.Value.JoinNumber,
                         join.Value.JoinSpan,
-                        String.IsNullOrEmpty(join.Value.Metadata.Description) ? join.Value.Metadata.Label: join.Value.Metadata.Description,
+                        String.IsNullOrEmpty(join.Value.AttributeName) ? join.Value.Metadata.Label : join.Value.AttributeName,
                         join.Value.Metadata.JoinType.ToString(),
                         join.Value.Metadata.JoinCapabilities.ToString());
             }
@@ -288,7 +305,7 @@ namespace PepperDash.Essentials.Core
                 }
                 else
                 {
-                    Debug.Console(2, "No mathcing key found in join map for: '{0}'", customJoinData.Key);
+                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
                 }
             }
 
@@ -327,7 +344,10 @@ namespace PepperDash.Essentials.Core
         None = 0,
         ToSIMPL = 1,
         FromSIMPL = 2,
-        ToFromSIMPL = ToSIMPL | FromSIMPL
+        ToFromSIMPL = ToSIMPL | FromSIMPL,
+        ToFusion = 4,
+        FromFusion = 8,
+        ToFromFusion = ToFusion | FromFusion,
     }
 
     [Flags]
@@ -340,7 +360,7 @@ namespace PepperDash.Essentials.Core
         DigitalAnalog = Digital | Analog,
         DigitalSerial = Digital | Serial,
         AnalogSerial = Analog | Serial,
-        DigitalAnalogSerial = Digital | Analog | Serial
+        DigitalAnalogSerial = Digital | Analog | Serial,
     }
 
     /// <summary>
@@ -394,7 +414,7 @@ namespace PepperDash.Essentials.Core
     }
 
     /// <summary>
-    /// Data describing the join.  Can be 
+    /// Data describing the join.  Can be overridden from configuratino
     /// </summary>
     public class JoinData
     {
@@ -408,6 +428,11 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         [JsonProperty("joinSpan")]
         public uint JoinSpan { get; set; }
+        /// <summary>
+        /// Fusion Attribute Name (optional)
+        /// </summary>
+        [JsonProperty("attributeName")]
+        public string AttributeName { get; set; }
     }
 
     /// <summary>
@@ -419,6 +444,10 @@ namespace PepperDash.Essentials.Core
 
         private JoinData _data;
         public JoinMetadata Metadata { get; set; }
+        /// <summary>
+        /// To store some future information as you please
+        /// </summary>
+        public object UserObject { get; private set; }
 
         public JoinDataComplete(JoinData data, JoinMetadata metadata)
         {
@@ -449,6 +478,11 @@ namespace PepperDash.Essentials.Core
             get { return _data.JoinSpan; }
         }
 
+        public string AttributeName
+        {
+            get { return _data.AttributeName; }
+        }
+
         public void SetCustomJoinData(JoinData customJoinData)
         {
             _data = customJoinData;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorCollection.cs

@@ -64,30 +64,34 @@ namespace PepperDash.Essentials.Core
 				initialStatus = MonitorStatus.InWarning;
 				prefix = "2:";
 			}
-			else if (InWarning.Count() > 0)
+			else if (IsOk.Count() > 0)
 				initialStatus = MonitorStatus.IsOk;
 			else
 				initialStatus = MonitorStatus.StatusUnknown;
 
 			// Build the error message string
-			if (InError.Count() > 0 || InWarning.Count() > 0)
-			{
-				StringBuilder sb = new StringBuilder(prefix);
-				if (InError.Count() > 0)
-				{
-					// Do string splits and joins 
-					sb.Append(string.Format("{0} Errors:", InError.Count()));
-					foreach (var mon in InError)
-						sb.Append(string.Format("{0}, ", mon.Parent.Key));
-				}
-				if (InWarning.Count() > 0)
-				{
-					sb.Append(string.Format("{0} Warnings:", InWarning.Count()));
-					foreach (var mon in InWarning)
-						sb.Append(string.Format("{0}, ", mon.Parent.Key));
-				}
-				Message = sb.ToString();
-			}
+            if (InError.Count() > 0 || InWarning.Count() > 0)
+            {
+                StringBuilder sb = new StringBuilder(prefix);
+                if (InError.Count() > 0)
+                {
+                    // Do string splits and joins 
+                    sb.Append(string.Format("{0} Errors:", InError.Count()));
+                    foreach (var mon in InError)
+                        sb.Append(string.Format("{0}, ", mon.Parent.Key));
+                }
+                if (InWarning.Count() > 0)
+                {
+                    sb.Append(string.Format("{0} Warnings:", InWarning.Count()));
+                    foreach (var mon in InWarning)
+                        sb.Append(string.Format("{0}, ", mon.Parent.Key));
+                }
+                Message = sb.ToString();
+            }
+            else
+            {
+                Message = "Room Ok.";
+            }
 
 			// Want to fire even if status doesn't change because the message may.
 			Status = initialStatus;

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

@@ -13,448 +13,586 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    [Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
-    public class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
-    {
-        public GlsOccupancySensorBase OccSensor { get; private set; }
+	[Description("Wrapper class for Single Technology GLS Occupancy Sensors")]
+    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0}")]
+	public class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
+	{
+        public GlsOccupancySensorPropertiesConfig PropertiesConfig { get; private set; }
 
-        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+		public GlsOccupancySensorBase OccSensor { get; private set; }
 
-        public BoolFeedback GraceOccupancyDetectedFeedback { get; private set; }
+		public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
 
-        public BoolFeedback RawOccupancyFeedback { get; private set; }
+		public BoolFeedback GraceOccupancyDetectedFeedback { get; private set; }
 
-        public BoolFeedback PirSensorEnabledFeedback { get; private set; }
+		public BoolFeedback RawOccupancyFeedback { get; private set; }
 
-        public BoolFeedback LedFlashEnabledFeedback { get; private set; }
+		public BoolFeedback PirSensorEnabledFeedback { get; private set; }
 
-        public BoolFeedback ShortTimeoutEnabledFeedback { get; private set; }
+		public BoolFeedback LedFlashEnabledFeedback { get; private set; }
 
-        public IntFeedback PirSensitivityInVacantStateFeedback { get; private set; }
+		public BoolFeedback ShortTimeoutEnabledFeedback { get; private set; }
 
-        public IntFeedback PirSensitivityInOccupiedStateFeedback { get; private set; }
+		public IntFeedback PirSensitivityInVacantStateFeedback { get; private set; }
 
-        public IntFeedback CurrentTimeoutFeedback { get; private set; }
+		public IntFeedback PirSensitivityInOccupiedStateFeedback { get; private set; }
 
-        public IntFeedback LocalTimoutFeedback { get; private set; }
+		public IntFeedback CurrentTimeoutFeedback { get; private set; }
 
-        public IntFeedback InternalPhotoSensorValue { get; set; }
+		public IntFeedback LocalTimoutFeedback { get; private set; }
 
-        public IntFeedback ExternalPhotoSensorValue { get; set; }
+		public IntFeedback InternalPhotoSensorValue { get; set; }
 
-        // Debug properties
-        public bool InTestMode { get; private set; }
+		public IntFeedback ExternalPhotoSensorValue { get; set; }
 
-        public bool TestRoomIsOccupiedFeedback { get; private set; }
+		// Debug properties
+		public bool InTestMode { get; private set; }
 
-        public Func<bool> RoomIsOccupiedFeedbackFunc
-        {
-            get
+		public bool TestRoomIsOccupiedFeedback { get; private set; }
+
+		public Func<bool> RoomIsOccupiedFeedbackFunc
+		{
+			get
+			{
+				return () => InTestMode ? TestRoomIsOccupiedFeedback : OccSensor.OccupancyDetectedFeedback.BoolValue;
+			}
+		}
+
+		public GlsOccupancySensorBaseController(string key, Func<DeviceConfig, GlsOccupancySensorBase> preActivationFunc,
+			DeviceConfig config)
+			: base(key, config.Name)
+		{
+            var props = config.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();
+
+            if (props != null)
             {
-                return () => InTestMode ? TestRoomIsOccupiedFeedback : OccSensor.OccupancyDetectedFeedback.BoolValue;
-            }
-        }
-
-        public GlsOccupancySensorBaseController(string key, Func<DeviceConfig, GlsOccupancySensorBase> preActivationFunc,
-            DeviceConfig config)
-            : base(key, config.Name)
-        {
-
-
-            AddPreActivationAction(() =>
-            {
-                OccSensor = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(OccSensor);
-
-                RegisterGlsOdtSensorBaseController(OccSensor);
-
-            });
-        }
-
-        public GlsOccupancySensorBaseController(string key, string name) : base(key, name) {}
-
-        protected void RegisterGlsOdtSensorBaseController(GlsOccupancySensorBase occSensor)
-        {
-            OccSensor = occSensor;
-
-            RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
-
-            PirSensorEnabledFeedback = new BoolFeedback(() => OccSensor.PirEnabledFeedback.BoolValue);
-
-            LedFlashEnabledFeedback = new BoolFeedback(() => OccSensor.LedFlashEnabledFeedback.BoolValue);
-
-            ShortTimeoutEnabledFeedback = new BoolFeedback(() => OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
-
-            PirSensitivityInVacantStateFeedback =
-                new IntFeedback(() => OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
-
-            PirSensitivityInOccupiedStateFeedback =
-                new IntFeedback(() => OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue);
-
-            CurrentTimeoutFeedback = new IntFeedback(() => OccSensor.CurrentTimeoutFeedback.UShortValue);
-
-            LocalTimoutFeedback = new IntFeedback(() => OccSensor.LocalTimeoutFeedback.UShortValue);
-
-            GraceOccupancyDetectedFeedback =
-                new BoolFeedback(() => OccSensor.GraceOccupancyDetectedFeedback.BoolValue);
-
-            RawOccupancyFeedback = new BoolFeedback(() => OccSensor.RawOccupancyFeedback.BoolValue);
-
-            InternalPhotoSensorValue = new IntFeedback(() => OccSensor.InternalPhotoSensorValueFeedback.UShortValue);
-
-            ExternalPhotoSensorValue = new IntFeedback(() => OccSensor.ExternalPhotoSensorValueFeedback.UShortValue);
-
-            OccSensor.BaseEvent += OccSensor_BaseEvent;
-
-            OccSensor.GlsOccupancySensorChange += OccSensor_GlsOccupancySensorChange;
-        }
-
-
-        /// <summary>
-        /// Catches events for feedbacks on the base class.  Any extending wrapper class should call this delegate after it checks for it's own event IDs.
-        /// </summary>
-        /// <param name="device"></param>
-        /// <param name="args"></param>
-        protected virtual void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
-        {
-            switch (args.EventId)
-            {
-                case GlsOccupancySensorBase.PirEnabledFeedbackEventId:
-                    PirSensorEnabledFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.LedFlashEnabledFeedbackEventId:
-                    LedFlashEnabledFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.ShortTimeoutEnabledFeedbackEventId:
-                    ShortTimeoutEnabledFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.PirSensitivityInOccupiedStateFeedbackEventId:
-                    PirSensitivityInOccupiedStateFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.PirSensitivityInVacantStateFeedbackEventId:
-                    PirSensitivityInVacantStateFeedback.FireUpdate();
-                    break;
-            }
-        }
-
-        protected virtual void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
-        {
-            Debug.Console(2, this, "GlsOccupancySensorChange  EventId: {0}", args.EventId);
-
-            switch (args.EventId)
-            {
-                case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomVacantFeedbackEventId:
-                case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomOccupiedFeedbackEventId:
-                    Debug.Console(1, this, "Occupancy State: {0}", OccSensor.OccupancyDetectedFeedback.BoolValue);
-                    RoomIsOccupiedFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.TimeoutFeedbackEventId:
-                    CurrentTimeoutFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.TimeoutLocalFeedbackEventId:
-                    LocalTimoutFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.GraceOccupancyDetectedFeedbackEventId:
-                    GraceOccupancyDetectedFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.RawOccupancyFeedbackEventId:
-                    RawOccupancyFeedback.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.InternalPhotoSensorValueFeedbackEventId:
-                    InternalPhotoSensorValue.FireUpdate();
-                    break;
-                case GlsOccupancySensorBase.ExternalPhotoSensorValueFeedbackEventId:
-                    ExternalPhotoSensorValue.FireUpdate();
-                    break;
-            }
-        }
-
-        public void SetTestMode(bool mode)
-        {
-            InTestMode = mode;
-
-            Debug.Console(1, this, "In Mock Mode: '{0}'", InTestMode);
-        }
-
-        public void SetTestOccupiedState(bool state)
-        {
-            if (!InTestMode)
-                Debug.Console(1, "Mock mode not enabled");
-            else
-            {
-                TestRoomIsOccupiedFeedback = state;
-
-                RoomIsOccupiedFeedback.FireUpdate();
-            }
-        }
-
-        /// <summary>
-        /// Enables or disables the PIR sensor
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetPirEnable(bool state)
-        {
-            if (state)
-            {
-                OccSensor.EnablePir.BoolValue = state;
-                OccSensor.DisablePir.BoolValue = !state;
+                PropertiesConfig = props;
             }
             else
             {
-                OccSensor.EnablePir.BoolValue = state;
-                OccSensor.DisablePir.BoolValue = !state;
-            }            
-        }
-
-        /// <summary>
-        /// Enables or disables the LED Flash
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetLedFlashEnable(bool state)
-        {
-            if (state)
-            {
-                OccSensor.EnableLedFlash.BoolValue = state;
-                OccSensor.DisableLedFlash.BoolValue = !state;
-            }
-            else
-            {
-                OccSensor.EnableLedFlash.BoolValue = state;
-                OccSensor.DisableLedFlash.BoolValue = !state;
-            }
-        }
-
-        /// <summary>
-        /// Enables or disables short timeout based on state
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetShortTimeoutState(bool state)
-        {
-            if (state)
-            {
-                OccSensor.EnableShortTimeout.BoolValue = state;
-                OccSensor.DisableShortTimeout.BoolValue = !state;
-            }
-            else
-            {
-                OccSensor.EnableShortTimeout.BoolValue = state;
-                OccSensor.DisableShortTimeout.BoolValue = !state;
-            }
-        }
-
-        public void IncrementPirSensitivityInOccupiedState(bool pressRelease)
-        {
-            OccSensor.IncrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
-        }
-
-        public void DecrementPirSensitivityInOccupiedState(bool pressRelease)
-        {
-            OccSensor.DecrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
-        }
-
-        public void IncrementPirSensitivityInVacantState(bool pressRelease)
-        {
-            OccSensor.IncrementPirSensitivityInVacantState.BoolValue = pressRelease;
-        }
-
-        public void DecrementPirSensitivityInVacantState(bool pressRelease)
-        {
-            OccSensor.DecrementPirSensitivityInVacantState.BoolValue = pressRelease;
-        }
-
-        public void ForceOccupied()
-        {
-            OccSensor.ForceOccupied.BoolValue = true;
-        }
-
-        public void ForceVacant()
-        {
-            OccSensor.ForceVacant.BoolValue = true;
-        }
-
-        public void EnableRawStates(bool state)
-        {
-            OccSensor.EnableRawStates.BoolValue = state;
-        }
-
-        public void SetRemoteTimeout(ushort time)
-        {
-            OccSensor.RemoteTimeout.UShortValue = time;
-        }
-
-        public void SetInternalPhotoSensorMinChange(ushort value)
-        {
-            OccSensor.InternalPhotoSensorMinimumChange.UShortValue = value;
-        }
-
-        public void SetExternalPhotoSensorMinChange(ushort value)
-        {
-            OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value;
-        }
-
-
-
-        protected void LinkOccSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
-            uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            var joinMap = new GlsOccupancySensorBaseJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(joinMapSerialized);
-
-            if (bridge != null)
-            {
-                bridge.AddJoinMap(Key, joinMap);
-            }
-            else
-            {
-                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+                Debug.Console(1, this, "props are null.  Unable to deserialize into GlsOccupancySensorPropertiesConfig");
             }
 
-            Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+			AddPreActivationAction(() =>
+			{
+				OccSensor = preActivationFunc(config);
 
-            #region Single and Dual Sensor Stuff
-            occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
+				RegisterCrestronGenericBase(OccSensor);
 
-            trilist.OnlineStatusChange += (d, args) =>
+				RegisterGlsOdtSensorBaseController(OccSensor);
+
+			});
+
+            AddPostActivationAction(() =>
             {
-                if (args.DeviceOnLine)
+                OccSensor.OnlineStatusChange += (o, a) =>
                 {
-                    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
-                }
-            };
+                    if (a.DeviceOnLine)
+                    {
+                        ApplySettingsToSensorFromConfig();
+                    }
+                };
+            });            
+		}
 
-            // Occupied status
-            trilist.SetSigTrueAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
-            trilist.SetSigTrueAction(joinMap.ForceVacant.JoinNumber, occController.ForceVacant);
-            occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback.JoinNumber]);
-            occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback.JoinNumber]);
-            occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback.JoinNumber]);
-            trilist.SetBoolSigAction(joinMap.EnableRawStates.JoinNumber, occController.EnableRawStates);
-
-            // Timouts
-            trilist.SetUShortSigAction(joinMap.Timeout.JoinNumber, occController.SetRemoteTimeout);
-            occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout.JoinNumber]);
-            occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback.JoinNumber]);
-
-            // LED Flash
-            trilist.SetSigTrueAction(joinMap.EnableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(true));
-            trilist.SetSigTrueAction(joinMap.DisableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(false));
-            occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash.JoinNumber]);
-
-            // Short Timeout
-            trilist.SetSigTrueAction(joinMap.EnableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(true));
-            trilist.SetSigTrueAction(joinMap.DisableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(false));
-            occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout.JoinNumber]);
-
-            // PIR Sensor
-            trilist.SetSigTrueAction(joinMap.EnablePir.JoinNumber, () => occController.SetPirEnable(true));
-            trilist.SetSigTrueAction(joinMap.DisablePir.JoinNumber, () => occController.SetPirEnable(false));
-            occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir.JoinNumber]);
-
-            // PIR Sensitivity in Occupied State
-            trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState.JoinNumber, occController.IncrementPirSensitivityInOccupiedState);
-            trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState.JoinNumber, occController.DecrementPirSensitivityInOccupiedState);
-            occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInOccupiedState.JoinNumber]);
-
-            // PIR Sensitivity in Vacant State
-            trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState.JoinNumber, occController.IncrementPirSensitivityInVacantState);
-            trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState.JoinNumber, occController.DecrementPirSensitivityInVacantState);
-            occController.PirSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInVacantState.JoinNumber]);
-            #endregion
-
-            #region Dual Technology Sensor Stuff
-            var odtOccController = occController as GlsOdtOccupancySensorController;
-
-            if (odtOccController == null) return;
-            // OR When Vacated
-            trilist.SetBoolSigAction(joinMap.OrWhenVacated.JoinNumber, odtOccController.SetOrWhenVacatedState);
-            odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated.JoinNumber]);
-
-            // AND When Vacated
-            trilist.SetBoolSigAction(joinMap.AndWhenVacated.JoinNumber, odtOccController.SetAndWhenVacatedState);
-            odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated.JoinNumber]);
-
-            // Ultrasonic A Sensor
-            trilist.SetSigTrueAction(joinMap.EnableUsA.JoinNumber, () => odtOccController.SetUsAEnable(true));
-            trilist.SetSigTrueAction(joinMap.DisableUsA.JoinNumber, () => odtOccController.SetUsAEnable(false));
-            odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA.JoinNumber]);
-
-            // Ultrasonic B Sensor
-            trilist.SetSigTrueAction(joinMap.EnableUsB.JoinNumber, () => odtOccController.SetUsBEnable(true));
-            trilist.SetSigTrueAction(joinMap.DisableUsB.JoinNumber, () => odtOccController.SetUsBEnable(false));
-            odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB.JoinNumber]);
-
-            // US Sensitivity in Occupied State
-            trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState.JoinNumber, odtOccController.IncrementUsSensitivityInOccupiedState);
-            trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState.JoinNumber, odtOccController.DecrementUsSensitivityInOccupiedState);
-            odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInOccupiedState.JoinNumber]);
-
-            // US Sensitivity in Vacant State
-            trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState.JoinNumber, odtOccController.IncrementUsSensitivityInVacantState);
-            trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState.JoinNumber, odtOccController.DecrementUsSensitivityInVacantState);
-            odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInVacantState.JoinNumber]);
-
-            //Sensor Raw States
-            odtOccController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
-            odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
-
-            #endregion
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+		public GlsOccupancySensorBaseController(string key, string name, DeviceConfig config)
+            : base(key, name) 
         {
-            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+
+            var props = config.Properties.ToObject<GlsOccupancySensorPropertiesConfig>();
+
+            if (props != null)
+            {
+                PropertiesConfig = props;
+            }
+            else
+            {
+                Debug.Console(1, this, "props are null.  Unable to deserialize into GlsOccupancySensorPropertiesConfig");
+            }
+
+            AddPostActivationAction(() =>
+                {
+                    OccSensor.OnlineStatusChange += (o, a) =>
+                    {
+                        if (a.DeviceOnLine)
+                        {
+                            ApplySettingsToSensorFromConfig();
+                        }
+                    };
+
+                    if (OccSensor.IsOnline)
+                    {
+                        ApplySettingsToSensorFromConfig();
+
+                    }
+                });
         }
 
-        #region PreActivation
 
-        private static GlsOirCCn GetGlsOirCCn(DeviceConfig dc)
+        /// <summary>
+        /// Applies any sensor settings defined in config 
+        /// </summary>
+        protected virtual void ApplySettingsToSensorFromConfig()
         {
-            var control = CommFactory.GetControlPropertiesConfig(dc);
-            var cresnetId = control.CresnetIdInt;
-            var branchId = control.ControlPortNumber;
-            var parentKey = string.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
+            Debug.Console(1, this, "Attempting to apply settings to sensor from config");
 
-            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+            if (PropertiesConfig.EnablePir != null)
             {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
-                return new GlsOirCCn(cresnetId, Global.ControlSystem);
+                Debug.Console(1, this, "EnablePir found, attempting to set value from config");
+                SetPirEnable((bool)PropertiesConfig.EnablePir);
+            }
+            else
+            {
+                Debug.Console(1, this, "EnablePir null, no value specified in config");
             }
-            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
 
-            if (cresnetBridge != null)
+            if (PropertiesConfig.EnableLedFlash != null)
             {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOirCCn", parentKey);
-                return new GlsOirCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+                Debug.Console(1, this, "EnableLedFlash found, attempting to set value from config");
+                SetLedFlashEnable((bool)PropertiesConfig.EnableLedFlash);
+            }
+
+            if (PropertiesConfig.RemoteTimeout != null)
+            {
+                Debug.Console(1, this, "RemoteTimeout found, attempting to set value from config");
+                SetRemoteTimeout((ushort)PropertiesConfig.RemoteTimeout);
+            }
+            else
+            {
+                Debug.Console(1, this, "RemoteTimeout null, no value specified in config");
+            }
+
+            if (PropertiesConfig.ShortTimeoutState != null)
+            {
+                SetShortTimeoutState((bool)PropertiesConfig.ShortTimeoutState);
+            }
+
+            if (PropertiesConfig.EnableRawStates != null)
+            {
+                EnableRawStates((bool)PropertiesConfig.EnableRawStates);
+            }
+
+            if (PropertiesConfig.InternalPhotoSensorMinChange != null)
+            {
+                SetInternalPhotoSensorMinChange((ushort)PropertiesConfig.InternalPhotoSensorMinChange);
+            }
+
+            if (PropertiesConfig.ExternalPhotoSensorMinChange != null)
+            {
+                SetExternalPhotoSensorMinChange((ushort)PropertiesConfig.ExternalPhotoSensorMinChange);
             }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
         }
-        #endregion
 
-        public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
-        {
-            public GlsOccupancySensorBaseControllerFactory()
-            {
-                TypeNames = new List<string>() { "glsoirccn" };
-            }
+		protected void RegisterGlsOdtSensorBaseController(GlsOccupancySensorBase occSensor)
+		{
+			OccSensor = occSensor;
+
+			RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
+
+			PirSensorEnabledFeedback = new BoolFeedback(() => OccSensor.PirEnabledFeedback.BoolValue);
+
+			LedFlashEnabledFeedback = new BoolFeedback(() => OccSensor.LedFlashEnabledFeedback.BoolValue);
+
+			ShortTimeoutEnabledFeedback = new BoolFeedback(() => OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
+
+			PirSensitivityInVacantStateFeedback =
+				new IntFeedback(() => OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
+
+			PirSensitivityInOccupiedStateFeedback =
+				new IntFeedback(() => OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue);
+
+			CurrentTimeoutFeedback = new IntFeedback(() => OccSensor.CurrentTimeoutFeedback.UShortValue);
+
+			LocalTimoutFeedback = new IntFeedback(() => OccSensor.LocalTimeoutFeedback.UShortValue);
+
+			GraceOccupancyDetectedFeedback =
+				new BoolFeedback(() => OccSensor.GraceOccupancyDetectedFeedback.BoolValue);
+
+			RawOccupancyFeedback = new BoolFeedback(() => OccSensor.RawOccupancyFeedback.BoolValue);
+
+			InternalPhotoSensorValue = new IntFeedback(() => OccSensor.InternalPhotoSensorValueFeedback.UShortValue);
+
+			ExternalPhotoSensorValue = new IntFeedback(() => OccSensor.ExternalPhotoSensorValueFeedback.UShortValue);
+
+			OccSensor.BaseEvent += OccSensor_BaseEvent;
+
+			OccSensor.GlsOccupancySensorChange += OccSensor_GlsOccupancySensorChange;
+		}
 
 
-            public override EssentialsDevice BuildDevice(DeviceConfig dc)
-            {
-                Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+		/// <summary>
+		/// Catches events for feedbacks on the base class.  Any extending wrapper class should call this delegate after it checks for it's own event IDs.
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="args"></param>
+		protected virtual void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
+		{
+			switch (args.EventId)
+			{
+				case GlsOccupancySensorBase.PirEnabledFeedbackEventId:
+					PirSensorEnabledFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.LedFlashEnabledFeedbackEventId:
+					LedFlashEnabledFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.ShortTimeoutEnabledFeedbackEventId:
+					ShortTimeoutEnabledFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.PirSensitivityInOccupiedStateFeedbackEventId:
+					PirSensitivityInOccupiedStateFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.PirSensitivityInVacantStateFeedbackEventId:
+					PirSensitivityInVacantStateFeedback.FireUpdate();
+					break;
+			}
+		}
 
-                return new GlsOccupancySensorBaseController(dc.Key, GetGlsOirCCn, dc);
-            }
+		protected virtual void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
+		{
+			Debug.Console(2, this, "GlsOccupancySensorChange  EventId: {0}", args.EventId);
+
+			switch (args.EventId)
+			{
+				case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomVacantFeedbackEventId:
+				case Crestron.SimplSharpPro.GeneralIO.GlsOccupancySensorBase.RoomOccupiedFeedbackEventId:
+					Debug.Console(1, this, "Occupancy State: {0}", OccSensor.OccupancyDetectedFeedback.BoolValue);
+					RoomIsOccupiedFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.TimeoutFeedbackEventId:
+					CurrentTimeoutFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.TimeoutLocalFeedbackEventId:
+					LocalTimoutFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.GraceOccupancyDetectedFeedbackEventId:
+					GraceOccupancyDetectedFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.RawOccupancyFeedbackEventId:
+					RawOccupancyFeedback.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.InternalPhotoSensorValueFeedbackEventId:
+					InternalPhotoSensorValue.FireUpdate();
+					break;
+				case GlsOccupancySensorBase.ExternalPhotoSensorValueFeedbackEventId:
+					ExternalPhotoSensorValue.FireUpdate();
+					break;
+			}
+		}
+
+		public void SetTestMode(bool mode)
+		{
+			InTestMode = mode;
+
+			Debug.Console(1, this, "In Mock Mode: '{0}'", InTestMode);
+		}
+
+		public void SetTestOccupiedState(bool state)
+		{
+			if (!InTestMode)
+				Debug.Console(1, "Mock mode not enabled");
+			else
+			{
+				TestRoomIsOccupiedFeedback = state;
+
+				RoomIsOccupiedFeedback.FireUpdate();
+			}
+		}
+
+		/// <summary>
+		/// Enables or disables the PIR sensor
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetPirEnable(bool state)
+		{
+            Debug.Console(1, this, "Setting EnablePir to: {0}", state);
+
+			if (state)
+			{
+				OccSensor.EnablePir.BoolValue = state;
+				OccSensor.DisablePir.BoolValue = !state;
+			}
+			else
+			{
+				OccSensor.EnablePir.BoolValue = state;
+				OccSensor.DisablePir.BoolValue = !state;
+			}
+		}
+
+		/// <summary>
+		/// Enables or disables the LED Flash
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetLedFlashEnable(bool state)
+		{
+			if (state)
+			{
+				OccSensor.EnableLedFlash.BoolValue = state;
+				OccSensor.DisableLedFlash.BoolValue = !state;
+			}
+			else
+			{
+				OccSensor.EnableLedFlash.BoolValue = state;
+				OccSensor.DisableLedFlash.BoolValue = !state;
+			}
+		}
+
+		/// <summary>
+		/// Enables or disables short timeout based on state
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetShortTimeoutState(bool state)
+		{
+			if (state)
+			{
+				OccSensor.EnableShortTimeout.BoolValue = state;
+				OccSensor.DisableShortTimeout.BoolValue = !state;
+			}
+			else
+			{
+				OccSensor.EnableShortTimeout.BoolValue = state;
+				OccSensor.DisableShortTimeout.BoolValue = !state;
+			}
+		}
+
+		public void IncrementPirSensitivityInOccupiedState(bool pressRelease)
+		{
+			OccSensor.IncrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
+		}
+
+		public void DecrementPirSensitivityInOccupiedState(bool pressRelease)
+		{
+			OccSensor.DecrementPirSensitivityInOccupiedState.BoolValue = pressRelease;
+		}
+
+		public void IncrementPirSensitivityInVacantState(bool pressRelease)
+		{
+			OccSensor.IncrementPirSensitivityInVacantState.BoolValue = pressRelease;
+		}
+
+		public void DecrementPirSensitivityInVacantState(bool pressRelease)
+		{
+			OccSensor.DecrementPirSensitivityInVacantState.BoolValue = pressRelease;
+		}
+
+		public void ForceOccupied()
+		{
+			OccSensor.ForceOccupied.BoolValue = true;
+		}
+
+		public void ForceVacant()
+		{
+			OccSensor.ForceVacant.BoolValue = true;
+		}
+
+		public void EnableRawStates(bool state)
+		{
+			OccSensor.EnableRawStates.BoolValue = state;
+		}
+
+		public void SetRemoteTimeout(ushort time)
+		{
+            Debug.Console(1, this, "Setting RemoteTimout to: {0}", time);
+
+			OccSensor.RemoteTimeout.UShortValue = time;
+		}
+
+		public void SetInternalPhotoSensorMinChange(ushort value)
+		{
+			OccSensor.InternalPhotoSensorMinimumChange.UShortValue = value;
+		}
+
+		public void SetExternalPhotoSensorMinChange(ushort value)
+		{
+			OccSensor.ExternalPhotoSensorMinimumChange.UShortValue = value;
+		}
+
+		/// <summary>
+		/// Method to print current occ settings to console.
+		/// </summary>
+		/// <param name="key"></param>
+		public virtual void GetSettings()
+		{
+			var dash = new string('*', 50);
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+
+            Debug.Console(0, this, "Vacancy Detected: {0}",
+                OccSensor.VacancyDetectedFeedback.BoolValue);
+
+			Debug.Console(0, this, "Timeout Current: {0} | Local: {1}",
+				OccSensor.CurrentTimeoutFeedback.UShortValue,
+				OccSensor.LocalTimeoutFeedback.UShortValue);
+
+			Debug.Console(0, this, "Short Timeout Enabled: {0}",
+				OccSensor.ShortTimeoutEnabledFeedback.BoolValue);
+
+			Debug.Console(0, this, "PIR Sensor Enabled: {0} | Sensitivity Occupied: {1} | Sensitivity Vacant: {2}",
+				OccSensor.PirEnabledFeedback.BoolValue,
+				OccSensor.PirSensitivityInOccupiedStateFeedback.UShortValue,
+				OccSensor.PirSensitivityInVacantStateFeedback.UShortValue);
+
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+		}
+
+		protected void LinkOccSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
+			uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+		{
+			var joinMap = new GlsOccupancySensorBaseJoinMap(joinStart);
+
+			var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+			if (!string.IsNullOrEmpty(joinMapSerialized))
+				joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(joinMapSerialized);
+
+			if (bridge != null)
+			{
+				bridge.AddJoinMap(Key, joinMap);
+			}
+			else
+			{
+				Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+			}
+
+			Debug.Console(1, occController, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+			#region Single and Dual Sensor Stuff
+			occController.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
+
+			trilist.OnlineStatusChange += (d, args) =>
+			{
+				if (args.DeviceOnLine)
+				{
+					trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
+				}
+			};
+
+			// Occupied status
+			trilist.SetSigTrueAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
+			trilist.SetSigTrueAction(joinMap.ForceVacant.JoinNumber, occController.ForceVacant);
+			occController.RoomIsOccupiedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RoomOccupiedFeedback.JoinNumber]);
+			occController.RoomIsOccupiedFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.RoomVacantFeedback.JoinNumber]);
+			occController.RawOccupancyFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyFeedback.JoinNumber]);
+			trilist.SetBoolSigAction(joinMap.EnableRawStates.JoinNumber, occController.EnableRawStates);
+
+			// Timouts
+			trilist.SetUShortSigAction(joinMap.Timeout.JoinNumber, occController.SetRemoteTimeout);
+			occController.CurrentTimeoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.Timeout.JoinNumber]);
+			occController.LocalTimoutFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeoutLocalFeedback.JoinNumber]);
+
+			// LED Flash
+			trilist.SetSigTrueAction(joinMap.EnableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(true));
+			trilist.SetSigTrueAction(joinMap.DisableLedFlash.JoinNumber, () => occController.SetLedFlashEnable(false));
+			occController.LedFlashEnabledFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.EnableLedFlash.JoinNumber]);
+
+			// Short Timeout
+			trilist.SetSigTrueAction(joinMap.EnableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(true));
+			trilist.SetSigTrueAction(joinMap.DisableShortTimeout.JoinNumber, () => occController.SetShortTimeoutState(false));
+			occController.ShortTimeoutEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableShortTimeout.JoinNumber]);
+
+			// PIR Sensor
+			trilist.SetSigTrueAction(joinMap.EnablePir.JoinNumber, () => occController.SetPirEnable(true));
+			trilist.SetSigTrueAction(joinMap.DisablePir.JoinNumber, () => occController.SetPirEnable(false));
+			occController.PirSensorEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnablePir.JoinNumber]);
+
+			// PIR Sensitivity in Occupied State
+			trilist.SetBoolSigAction(joinMap.IncrementPirInOccupiedState.JoinNumber, occController.IncrementPirSensitivityInOccupiedState);
+			trilist.SetBoolSigAction(joinMap.DecrementPirInOccupiedState.JoinNumber, occController.DecrementPirSensitivityInOccupiedState);
+			occController.PirSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInOccupiedState.JoinNumber]);
+
+			// PIR Sensitivity in Vacant State
+			trilist.SetBoolSigAction(joinMap.IncrementPirInVacantState.JoinNumber, occController.IncrementPirSensitivityInVacantState);
+			trilist.SetBoolSigAction(joinMap.DecrementPirInVacantState.JoinNumber, occController.DecrementPirSensitivityInVacantState);
+			occController.PirSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.PirSensitivityInVacantState.JoinNumber]);
+			#endregion
+
+			#region Dual Technology Sensor Stuff
+			var odtOccController = occController as GlsOdtOccupancySensorController;
+
+			if (odtOccController == null) return;
+			// OR When Vacated
+			trilist.SetBoolSigAction(joinMap.OrWhenVacated.JoinNumber, odtOccController.SetOrWhenVacatedState);
+			odtOccController.OrWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.OrWhenVacated.JoinNumber]);
+
+			// AND When Vacated
+			trilist.SetBoolSigAction(joinMap.AndWhenVacated.JoinNumber, odtOccController.SetAndWhenVacatedState);
+			odtOccController.AndWhenVacatedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.AndWhenVacated.JoinNumber]);
+
+			// Ultrasonic A Sensor
+			trilist.SetSigTrueAction(joinMap.EnableUsA.JoinNumber, () => odtOccController.SetUsAEnable(true));
+			trilist.SetSigTrueAction(joinMap.DisableUsA.JoinNumber, () => odtOccController.SetUsAEnable(false));
+			odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsA.JoinNumber]);
+
+			// Ultrasonic B Sensor
+			trilist.SetSigTrueAction(joinMap.EnableUsB.JoinNumber, () => odtOccController.SetUsBEnable(true));
+			trilist.SetSigTrueAction(joinMap.DisableUsB.JoinNumber, () => odtOccController.SetUsBEnable(false));
+			odtOccController.UltrasonicAEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.EnableUsB.JoinNumber]);
+
+			// US Sensitivity in Occupied State
+			trilist.SetBoolSigAction(joinMap.IncrementUsInOccupiedState.JoinNumber, odtOccController.IncrementUsSensitivityInOccupiedState);
+			trilist.SetBoolSigAction(joinMap.DecrementUsInOccupiedState.JoinNumber, odtOccController.DecrementUsSensitivityInOccupiedState);
+			odtOccController.UltrasonicSensitivityInOccupiedStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInOccupiedState.JoinNumber]);
+
+			// US Sensitivity in Vacant State
+			trilist.SetBoolSigAction(joinMap.IncrementUsInVacantState.JoinNumber, odtOccController.IncrementUsSensitivityInVacantState);
+			trilist.SetBoolSigAction(joinMap.DecrementUsInVacantState.JoinNumber, odtOccController.DecrementUsSensitivityInVacantState);
+			odtOccController.UltrasonicSensitivityInVacantStateFeedback.LinkInputSig(trilist.UShortInput[joinMap.UsSensitivityInVacantState.JoinNumber]);
+
+			//Sensor Raw States
+			odtOccController.RawOccupancyPirFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyPirFeedback.JoinNumber]);
+			odtOccController.RawOccupancyUsFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RawOccupancyUsFeedback.JoinNumber]);
+
+			#endregion
+		}
+
+		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+		{
+			LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+		}
+
+		#region PreActivation
+
+		private static GlsOirCCn GetGlsOirCCn(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 GlsOirCCn", parentKey);
+				return new GlsOirCCn(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 GlsOirCCn", parentKey);
+				return new GlsOirCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+			}
+			Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+			return null;
+		}
+		#endregion
+
+		public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
+		{
+			public GlsOccupancySensorBaseControllerFactory()
+			{
+				TypeNames = new List<string>() { "glsoirccn" };
+			}
+
+
+			public override EssentialsDevice BuildDevice(DeviceConfig dc)
+			{
+				Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+
+				return new GlsOccupancySensorBaseController(dc.Key, GetGlsOirCCn, dc);
+			}
+
+		}
+	}
 
-        }
-    }
 
-    
 
 }

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

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Defines configuration properties for Crestron GLS series occupancy sensors
+    /// </summary>
+    public class GlsOccupancySensorPropertiesConfig
+    {
+        // Single Technology Sensors (PIR): GlsOccupancySensorBase
+        [JsonProperty("enablePir")]
+        public bool? EnablePir { get; set; }
+
+        [JsonProperty("enableLedFlash")]
+        public bool? EnableLedFlash { get; set; }
+
+        [JsonProperty("shortTimeoutState")]
+        public bool? ShortTimeoutState { get; set; }
+
+        [JsonProperty("enableRawStates")]
+        public bool? EnableRawStates { get; set; }
+
+        [JsonProperty("remoteTimeout")]
+        public ushort? RemoteTimeout { get; set; }
+
+        [JsonProperty("internalPhotoSensorMinChange")]
+        public ushort? InternalPhotoSensorMinChange { get; set; }
+
+        [JsonProperty("externalPhotoSensorMinChange")]
+        public ushort? ExternalPhotoSensorMinChange { get; set; }
+
+        // Dual Technology Sensors: GlsOdtCCn
+        [JsonProperty("enableUsA")]
+        public bool? EnableUsA { get; set; }
+
+        [JsonProperty("enableUsB")]
+        public bool? EnableUsB { get; set; }
+
+        [JsonProperty("orWhenVacatedState")]
+        public bool? OrWhenVacatedState { get; set; }
+
+        [JsonProperty("andWhenVacatedState")]
+        public bool? AndWhenVacatedState { get; set; }
+    }
+}

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

@@ -13,206 +13,266 @@ using PepperDash.Essentials.Core.Bridges;
 
 namespace PepperDash.Essentials.Core
 {
-    [Description("Wrapper class for Dual Technology GLS Occupancy Sensors")]
+	[Description("Wrapper class for Dual Technology GLS Occupancy Sensors")]
+    [ConfigSnippet("\"properties\": {\"control\": {\"method\": \"cresnet\",\"cresnetId\": \"97\"},\"enablePir\": true,\"enableLedFlash\": true,\"enableRawStates\":true,\"remoteTimeout\": 30,\"internalPhotoSensorMinChange\": 0,\"externalPhotoSensorMinChange\": 0,\"enableUsA\": true,\"enableUsB\": true,\"orWhenVacatedState\": true}")]
     public class GlsOdtOccupancySensorController : GlsOccupancySensorBaseController
-    {
-        public new GlsOdtCCn OccSensor { get; private set; }
+	{
+		public new GlsOdtCCn OccSensor { get; private set; }
 
-        public BoolFeedback OrWhenVacatedFeedback { get; private set; }
+		public BoolFeedback OrWhenVacatedFeedback { get; private set; }
 
-        public BoolFeedback AndWhenVacatedFeedback { get; private set; }
+		public BoolFeedback AndWhenVacatedFeedback { get; private set; }
 
-        public BoolFeedback UltrasonicAEnabledFeedback { get; private set; }
+		public BoolFeedback UltrasonicAEnabledFeedback { get; private set; }
 
-        public BoolFeedback UltrasonicBEnabledFeedback { get; private set; }
+		public BoolFeedback UltrasonicBEnabledFeedback { get; private set; }
 
-        public IntFeedback UltrasonicSensitivityInVacantStateFeedback { get; private set; }
+		public IntFeedback UltrasonicSensitivityInVacantStateFeedback { get; private set; }
 
-        public IntFeedback UltrasonicSensitivityInOccupiedStateFeedback { get; private set; }
+		public IntFeedback UltrasonicSensitivityInOccupiedStateFeedback { get; private set; }
 
-        public BoolFeedback RawOccupancyPirFeedback { get; private set; }
+		public BoolFeedback RawOccupancyPirFeedback { get; private set; }
 
-        public BoolFeedback RawOccupancyUsFeedback { get; private set; }
+		public BoolFeedback RawOccupancyUsFeedback { get; private set; }
 
 
-        public GlsOdtOccupancySensorController(string key, Func<DeviceConfig, GlsOdtCCn> preActivationFunc,
-            DeviceConfig config)
-            : base(key, config.Name)
+		public GlsOdtOccupancySensorController(string key, Func<DeviceConfig, GlsOdtCCn> preActivationFunc,
+			DeviceConfig config)
+			: base(key, config.Name, config)
+		{
+			AddPreActivationAction(() =>
+			{
+				OccSensor = preActivationFunc(config);
+
+				RegisterCrestronGenericBase(OccSensor);
+
+				RegisterGlsOdtSensorBaseController(OccSensor);
+
+				AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue);
+
+				OrWhenVacatedFeedback = new BoolFeedback(() => OccSensor.OrWhenVacatedFeedback.BoolValue);
+
+				UltrasonicAEnabledFeedback = new BoolFeedback(() => OccSensor.UsAEnabledFeedback.BoolValue);
+
+				UltrasonicBEnabledFeedback = new BoolFeedback(() => OccSensor.UsBEnabledFeedback.BoolValue);
+
+				RawOccupancyPirFeedback = new BoolFeedback(() => OccSensor.RawOccupancyPirFeedback.BoolValue);
+
+				RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyUsFeedback.BoolValue);
+
+				UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
+
+				UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);
+
+			});		
+
+
+		}
+
+        protected override void ApplySettingsToSensorFromConfig()
         {
-            AddPreActivationAction(() =>
+            base.ApplySettingsToSensorFromConfig();
+
+            if (PropertiesConfig.EnableUsA != null)
             {
-                OccSensor = preActivationFunc(config);
-
-                RegisterCrestronGenericBase(OccSensor);
-
-                RegisterGlsOdtSensorBaseController(OccSensor);
-
-                AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue);
-
-                OrWhenVacatedFeedback = new BoolFeedback(() => OccSensor.OrWhenVacatedFeedback.BoolValue);
-
-                UltrasonicAEnabledFeedback = new BoolFeedback(() => OccSensor.UsAEnabledFeedback.BoolValue);
-
-                UltrasonicBEnabledFeedback = new BoolFeedback(() => OccSensor.UsBEnabledFeedback.BoolValue);
-
-                RawOccupancyPirFeedback = new BoolFeedback(() => OccSensor.RawOccupancyPirFeedback.BoolValue);
-
-                RawOccupancyUsFeedback = new BoolFeedback(() => OccSensor.RawOccupancyUsFeedback.BoolValue);
-
-                UltrasonicSensitivityInVacantStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
-
-                UltrasonicSensitivityInOccupiedStateFeedback = new IntFeedback(() => OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue);
-
-            });       
-        }
-
-        /// <summary>
-        /// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
-        /// Then calls the base delegate method to ensure any common event IDs are captured.
-        /// </summary>
-        /// <param name="device"></param>
-        /// <param name="args"></param>
-        protected override void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
-        {
-            if (args.EventId == GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId)
-                AndWhenVacatedFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId)
-                OrWhenVacatedFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.UsAEnabledFeedbackEventId)
-                UltrasonicAEnabledFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.UsBEnabledFeedbackEventId)
-                UltrasonicBEnabledFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId)
-                UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId)
-                UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
-
-            base.OccSensor_GlsOccupancySensorChange(device, args);
-        }
-
-        /// <summary>
-        /// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
-        /// Then calls the base delegate method to ensure any common event IDs are captured.
-        /// </summary>
-        /// <param name="device"></param>
-        /// <param name="args"></param>
-        protected override void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
-        {
-             if (args.EventId == GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId)
-                RawOccupancyPirFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId)
-                RawOccupancyUsFeedback.FireUpdate();
-
-            base.OccSensor_BaseEvent(device, args);
-        }
-
-        /// <summary>
-        /// Sets the OrWhenVacated state
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetOrWhenVacatedState(bool state)
-        {
-            OccSensor.OrWhenVacated.BoolValue = state;
-        }
-
-        /// <summary>
-        /// Sets the AndWhenVacated state
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetAndWhenVacatedState(bool state)
-        {
-            OccSensor.AndWhenVacated.BoolValue = state;
-        }
-
-        /// <summary>
-        /// Enables or disables the Ultrasonic A sensor
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetUsAEnable(bool state)
-        {
-            OccSensor.EnableUsA.BoolValue = state;
-            OccSensor.DisableUsA.BoolValue = !state;
-        }
-
-
-        /// <summary>
-        /// Enables or disables the Ultrasonic B sensor
-        /// </summary>
-        /// <param name="state"></param>
-        public void SetUsBEnable(bool state)
-        {
-            OccSensor.EnableUsB.BoolValue = state;
-            OccSensor.DisableUsB.BoolValue = !state;
-        }
-
-        public void IncrementUsSensitivityInOccupiedState(bool pressRelease)
-        {
-            OccSensor.IncrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
-        }
-
-        public void DecrementUsSensitivityInOccupiedState(bool pressRelease)
-        {
-            OccSensor.DecrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
-        }
-
-        public void IncrementUsSensitivityInVacantState(bool pressRelease)
-        {
-            OccSensor.IncrementUsSensitivityInVacantState.BoolValue = pressRelease;
-        }
-
-        public void DecrementUsSensitivityInVacantState(bool pressRelease)
-        {
-            OccSensor.DecrementUsSensitivityInVacantState.BoolValue = pressRelease;
-        }
-
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
-            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
-        }
-
-        #region PreActivation
-
-        private static GlsOdtCCn GetGlsOdtCCn(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 GlsOdtCCn", parentKey);
-                return new GlsOdtCCn(cresnetId, Global.ControlSystem);
+                Debug.Console(1, this, "EnableUsA found, attempting to set value from config");
+                SetUsAEnable((bool)PropertiesConfig.EnableUsA);   
             }
-            var cresnetBridge = DeviceManager.GetDeviceForKey(parentKey) as IHasCresnetBranches;
-
-            if (cresnetBridge != null)
+            else
             {
-                Debug.Console(0, "Device {0} is a valid cresnet master - creating new GlsOdtCCn", parentKey);
-                return new GlsOdtCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
-            }
-            Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
-            return null;
-        }
-        #endregion
-
-        public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
-        {
-            public GlsOdtOccupancySensorControllerFactory()
-            {
-                TypeNames = new List<string>() { "glsodtccn" };
+                Debug.Console(1, this, "EnableUsA null, no value specified in config");
             }
 
 
-            public override EssentialsDevice BuildDevice(DeviceConfig dc)
+            if (PropertiesConfig.EnableUsB != null)
             {
-                Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
-
-                return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
+                Debug.Console(1, this, "EnableUsB found, attempting to set value from config");
+                SetUsBEnable((bool)PropertiesConfig.EnableUsB);
+            }
+            else
+            {
+                Debug.Console(1, this, "EnablePir null, no value specified in config");
             }
 
+
+            if (PropertiesConfig.OrWhenVacatedState != null)
+            {
+                SetOrWhenVacatedState((bool)PropertiesConfig.OrWhenVacatedState);
+            }
+
+            if (PropertiesConfig.AndWhenVacatedState != null)
+            {
+                SetAndWhenVacatedState((bool)PropertiesConfig.AndWhenVacatedState);
+            }
         }
-    }
+
+		/// <summary>
+		/// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
+		/// Then calls the base delegate method to ensure any common event IDs are captured.
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="args"></param>
+		protected override void OccSensor_GlsOccupancySensorChange(GlsOccupancySensorBase device, GlsOccupancySensorChangeEventArgs args)
+		{
+			if (args.EventId == GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId)
+				AndWhenVacatedFeedback.FireUpdate();
+			else if (args.EventId == GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId)
+				OrWhenVacatedFeedback.FireUpdate();
+			else if (args.EventId == GlsOccupancySensorBase.UsAEnabledFeedbackEventId)
+				UltrasonicAEnabledFeedback.FireUpdate();
+			else if (args.EventId == GlsOccupancySensorBase.UsBEnabledFeedbackEventId)
+				UltrasonicBEnabledFeedback.FireUpdate();
+			else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId)
+				UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
+			else if (args.EventId == GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId)
+				UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
+
+			base.OccSensor_GlsOccupancySensorChange(device, args);
+		}
+
+		/// <summary>
+		/// Overrides the base class event delegate to fire feedbacks for event IDs that pertain to this extended class.
+		/// Then calls the base delegate method to ensure any common event IDs are captured.
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="args"></param>
+		protected override void OccSensor_BaseEvent(Crestron.SimplSharpPro.GenericBase device, Crestron.SimplSharpPro.BaseEventArgs args)
+		{
+			if (args.EventId == GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId)
+				RawOccupancyPirFeedback.FireUpdate();
+			else if (args.EventId == GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId)
+				RawOccupancyUsFeedback.FireUpdate();
+
+			base.OccSensor_BaseEvent(device, args);
+		}
+
+		/// <summary>
+		/// Sets the OrWhenVacated state
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetOrWhenVacatedState(bool state)
+		{
+			OccSensor.OrWhenVacated.BoolValue = state;
+		}
+
+		/// <summary>
+		/// Sets the AndWhenVacated state
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetAndWhenVacatedState(bool state)
+		{
+			OccSensor.AndWhenVacated.BoolValue = state;
+		}
+
+		/// <summary>
+		/// Enables or disables the Ultrasonic A sensor
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetUsAEnable(bool state)
+		{
+			OccSensor.EnableUsA.BoolValue = state;
+			OccSensor.DisableUsA.BoolValue = !state;
+		}
+
+
+		/// <summary>
+		/// Enables or disables the Ultrasonic B sensor
+		/// </summary>
+		/// <param name="state"></param>
+		public void SetUsBEnable(bool state)
+		{
+			OccSensor.EnableUsB.BoolValue = state;
+			OccSensor.DisableUsB.BoolValue = !state;
+		}
+
+		public void IncrementUsSensitivityInOccupiedState(bool pressRelease)
+		{
+			OccSensor.IncrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
+		}
+
+		public void DecrementUsSensitivityInOccupiedState(bool pressRelease)
+		{
+			OccSensor.DecrementUsSensitivityInOccupiedState.BoolValue = pressRelease;
+		}
+
+		public void IncrementUsSensitivityInVacantState(bool pressRelease)
+		{
+			OccSensor.IncrementUsSensitivityInVacantState.BoolValue = pressRelease;
+		}
+
+		public void DecrementUsSensitivityInVacantState(bool pressRelease)
+		{
+			OccSensor.DecrementUsSensitivityInVacantState.BoolValue = pressRelease;
+		}
+
+		public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+		{
+			LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+		}
+
+		/// <summary>
+		/// Method to print occ sensor settings to console.
+		/// </summary>
+		public override void GetSettings()
+		{
+            base.GetSettings();
+
+			Debug.Console(0, this, "Ultrasonic Enabled A: {0} | B: {1}",
+				OccSensor.UsAEnabledFeedback.BoolValue,
+				OccSensor.UsBEnabledFeedback.BoolValue);
+
+			Debug.Console(0, this, "Ultrasonic Sensitivity Occupied: {0} | Vacant: {1}",
+				OccSensor.UsSensitivityInOccupiedStateFeedback.UShortValue,
+				OccSensor.UsSensitivityInVacantStateFeedback.UShortValue);
+
+            var dash = new string('*', 50);
+			CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+		}
+
+
+		#region PreActivation
+
+		private static GlsOdtCCn GetGlsOdtCCn(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 GlsOdtCCn", parentKey);
+				return new GlsOdtCCn(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 GlsOdtCCn", parentKey);
+				return new GlsOdtCCn(cresnetId, cresnetBridge.CresnetBranches[branchId]);
+			}
+			Debug.Console(0, "Device {0} is not a valid cresnet master", parentKey);
+			return null;
+		}
+		#endregion
+
+		public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
+		{
+			public GlsOdtOccupancySensorControllerFactory()
+			{
+				TypeNames = new List<string>() { "glsodtccn" };
+			}
+
+
+			public override EssentialsDevice BuildDevice(DeviceConfig dc)
+			{
+				Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+
+				return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
+			}
+
+		}
+	}
 
 
 

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

@@ -220,12 +220,14 @@
     <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
     <Compile Include="Fusion\FusionEventHandlers.cs" />
     <Compile Include="Fusion\FusionProcessorQueries.cs" />
+    <Compile Include="Fusion\EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs" />
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
     <Compile Include="Global\EthernetAdapterInfo.cs" />
     <Compile Include="Interfaces\ILogStrings.cs" />
     <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
+    <Compile Include="Occupancy\GlsOccupancySensorPropertiesConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />

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

@@ -14,7 +14,7 @@
     <tags>crestron 3series 4series</tags>
     <repository type="git" url="https://github.com/PepperDash/Essentials"/>
     <dependencies>
-      <dependency id="PepperDashCore" version="[1.0.44, 1.1.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.45, 1.1.0)"/>
     </dependencies>
   </metadata>
   <files>

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

@@ -40,7 +40,7 @@ namespace PepperDash_Essentials_Core.Queues
 
         private void Validate(IBasicCommunication coms, object message)
         {
-            if (_coms == null)
+            if (coms == null)
                 throw new ArgumentNullException("coms");
 
             if (message == null)

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

@@ -15,23 +15,37 @@ namespace PepperDash_Essentials_Core.Queues
         protected readonly Thread _worker;
         protected readonly CEvent _waitHandle = new CEvent();
         
-        private readonly bool _delayEnabled;
-        private readonly int _delayTime;
+        private bool _delayEnabled;
+        private int _delayTime;
 
         /// <summary>
         /// If the instance has been disposed.
         /// </summary>
         public bool Disposed { get; private set; }
 
+        /// <summary>
+        /// Constructor with no thread priority
+        /// </summary>
+        /// <param name="key"></param>
+        public GenericQueue(string key)
+            : this(key, Thread.eThreadPriority.MediumPriority)
+        {
+
+        }
+
         /// <summary>
         /// Constructor for generic queue with no pacing
         /// </summary>
         /// <param name="key">Key</param>
-        public GenericQueue(string key)
+        /// <param name="priority"></param>
+        public GenericQueue(string key, Thread.eThreadPriority priority)
         {
             _key = key;
-            _queue = new CrestronQueue<IQueueMessage>();
-            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running);
+            _queue = new CrestronQueue<IQueueMessage>(25);
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
+                {
+                    Priority = priority
+                };
 
             CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
             {
@@ -49,11 +63,28 @@ namespace PepperDash_Essentials_Core.Queues
         /// <param name="pacing">Pacing in ms between actions</param>
         public GenericQueue(string key, int pacing)
             : this(key)
+        {
+            SetDelayValues(pacing);
+        }
+
+        /// <summary>
+        /// Constructor with pacing and priority
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="priority"></param>
+        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority)
+            : this(key, priority)
+        {
+            SetDelayValues(pacing);
+        }
+
+        private void SetDelayValues(int pacing)
         {
             _delayEnabled = pacing > 0;
             _delayTime = pacing;
         }
-
+        
         /// <summary>
         /// Thread callback
         /// </summary>
@@ -83,7 +114,7 @@ namespace PepperDash_Essentials_Core.Queues
                     }
                     catch (Exception ex)
                     {
-                        Debug.ConsoleWithLog(0, this, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
+                        Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Caught an exception in the Queue {0}\r{1}\r{2}", ex.Message, ex.InnerException, ex.StackTrace);
                     }
                 }
                 else _waitHandle.Wait();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingInterfaces.cs

@@ -92,6 +92,16 @@ namespace PepperDash.Essentials.Core
 		void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType);
     }
 
+    public interface IRoutingWithClear : IRouting
+    {
+        /// <summary>
+        /// Clears a route to an output, however a device needs to do that
+        /// </summary>
+        /// <param name="outputSelector">Output to clear</param>
+        /// <param name="signalType">signal type to clear</param>
+        void ClearRoute(object outputSelector, eRoutingSignalType signalType);
+    }
+
     public interface IRoutingNumeric : IRouting
     {
         void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type);

essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxThreePanelPageManager.cs

@@ -169,9 +169,9 @@ namespace PepperDash.Essentials.Core.PageManagers
             }
 
 			// Build presets
-            if (stb.HasPresets && stb.PresetsModel != null)
+            if (stb.HasPresets && stb.TvPresets != null)
 			{
-				PresetsView = new DevicePresetsView(trilist, stb.PresetsModel);
+				PresetsView = new DevicePresetsView(trilist, stb.TvPresets);
 			}
 		}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/UI PageManagers/SetTopBoxTwoPanelPageManager.cs

@@ -18,8 +18,8 @@ namespace PepperDash.Essentials.Core.PageManagers
 		{
 			SetTopBox = stb;
 			TriList = trilist;
-			if(stb.PresetsModel != null)
-				PresetsView = new DevicePresetsView(trilist, stb.PresetsModel);
+			if(stb.TvPresets != null)
+				PresetsView = new DevicePresetsView(trilist, stb.TvPresets);
 		}
 
 		public override void Show()

essentials-framework/Essentials DM/Essentials_DM/Endpoints/DGEs/Dge100Controller.cs

@@ -44,7 +44,7 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs
 
             DeviceInfo = new DeviceInfo();
 
-            //_dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
+            _dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
 
             _dc = dc;
 
@@ -123,29 +123,56 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs
 
             gather.LineReceived += (sender, args) =>
             {
-                if (args.Text.ToLower().Contains("host"))
+                try
                 {
-                    DeviceInfo.HostName = args.Text.Split(';')[1].Trim();
+                    Debug.Console(1, this, "{0}", args.Text);
 
-                    tcpClient.Disconnect();
-                    return;
+                    if (args.Text.ToLower().Contains("host"))
+                    {
+                        DeviceInfo.HostName = args.Text.Split(':')[1].Trim();
+
+                        Debug.Console(1, this, "hostname: {0}", DeviceInfo.HostName);
+                        tcpClient.Disconnect();
+                        return;
+                    }
+
+                    //ignore console prompt
+                    /*if (args.Text.ToLower().Contains(">"))
+                    {
+                        Debug.Console(1, this, "Ignoring console");
+                        return;
+                    }
+
+                    if (args.Text.ToLower().Contains("dge"))
+                    {
+                        Debug.Console(1, this, "Ignoring DGE");
+                        return;
+                    }*/
+
+                    if (!args.Text.Contains('['))
+                    {
+                        return;
+                    }
+                    var splitResponse = args.Text.Split('[');
+
+                    foreach (string t in splitResponse)
+                    {
+                        Debug.Console(1, this, "{0}", t);
+                    }
+
+                    DeviceInfo.SerialNumber = splitResponse[1].Split(' ')[4].Replace("#", "");
+                    DeviceInfo.FirmwareVersion = splitResponse[1].Split(' ')[0];
+
+                    Debug.Console(1, this, "Firmware: {0} SerialNumber: {1}", DeviceInfo.FirmwareVersion,
+                        DeviceInfo.SerialNumber);
+
+                    tcpClient.SendText("host\r\n");
                 }
-
-                //ignore console prompt
-                if (args.Text.ToLower().Contains(">"))
+                catch (Exception ex)
                 {
-                    return;
+                    Debug.Console(0, this, "Exception getting data: {0}", ex.Message);
+                    Debug.Console(0, this, "response: {0}", args.Text);
                 }
-
-                if (!args.Text.ToLower().Contains("dge"))
-                {
-                    return;
-                }
-
-                DeviceInfo.SerialNumber = args.Text.Split('[')[1].Split(' ')[4].Replace("#", "");
-                DeviceInfo.FirmwareVersion = args.Text.Split('[')[1].Split(' ')[1];
-
-                tcpClient.SendText("host\r\n");
             };
 
             tcpClient.Connect();

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs

@@ -122,7 +122,9 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
-					}
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(chassis.Inputs[num]));
+                    }
 					else
 					{
 						if (typeName.StartsWith("dmtx200"))
@@ -145,7 +147,9 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
-					}
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(ipid, chassis.Inputs[num]));
+                    }
 				}
 				catch (Exception e)
 				{
@@ -355,7 +359,7 @@ namespace PepperDash.Essentials.DM
         public DmTxControllerFactory()
         {
             TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g"  };
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/HDBaseTTxController.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.DM
+{
+    /// <summary>
+    /// Controller class for suitable for HDBaseT transmitters
+    /// </summary>
+    [Description("Wrapper Class for HDBaseT devices based on HDTx3CB class")]
+    public class HDBaseTTxController: BasicDmTxControllerBase, IRoutingInputsOutputs, IComPorts
+    {
+        public RoutingInputPort HdmiIn { get; private set; }
+        public RoutingOutputPort DmOut { get; private set; }
+
+        public HDBaseTTxController(string key, string name, HDTx3CB tx)
+            : base(key, name, tx)
+        {
+            HdmiIn = new RoutingInputPort(DmPortName.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this) { Port = tx };
+
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.DmCat, null, this);
+
+            InputPorts = new RoutingPortCollection<RoutingInputPort> { HdmiIn };
+            OutputPorts = new RoutingPortCollection<RoutingOutputPort> { DmOut };
+        }
+
+        #region IRoutingInputs Members
+
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+        #endregion
+
+        #region IRoutingOutputs Members
+
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+
+        #endregion
+        
+        #region IComPorts Members
+
+        public CrestronCollection<ComPort> ComPorts { get { return (Hardware as HDTx3CB).ComPorts; } }
+        public int NumberOfComPorts { get { return (Hardware as HDTx3CB).NumberOfComPorts; } }
+
+        #endregion
+
+        #region CrestronBridgeableBaseDevice abstract overrides
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new HDBaseTTxControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<HDBaseTTxControllerJoinMap>(joinMapSerialized);
+
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            }
+
+            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            this.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+
+        }
+
+        #endregion
+    }
+
+    public class HDBaseTTxControllerJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "HDBaseT device online feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+	
+        /// <summary>
+		/// Plugin device BridgeJoinMap constructor
+		/// </summary>
+		/// <param name="joinStart">This will be the join it starts on the EISC bridge</param>
+        public HDBaseTTxControllerJoinMap(uint joinStart)
+            : base(joinStart, typeof(HDBaseTTxControllerJoinMap))
+		{
+		}
+    }
+}

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -108,6 +108,7 @@
     <Compile Include="Endpoints\Transmitters\DmTx4kz202CController.cs" />
     <Compile Include="Endpoints\Transmitters\DmTx201SController.cs" />
     <Compile Include="Endpoints\Transmitters\DmTx4kz100Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\HDBaseTTxController.cs" />
     <Compile Include="Endpoints\Transmitters\TxInterfaces.cs" />
     <Compile Include="IDmSwitch.cs" />
     <Compile Include="Config\DmpsRoutingConfig.cs" />

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

@@ -149,7 +149,7 @@ namespace PepperDash.Essentials.Devices.Displays
 		public override bool CustomActivate()
 		{
 			Communication.Connect();
-			CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
+			CommunicationMonitor.StatusChange += (o, a) => Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status);
 			CommunicationMonitor.Start();
 			return true;
 		}
@@ -188,9 +188,6 @@ namespace PepperDash.Essentials.Devices.Displays
                 IncomingBuffer.CopyTo(newBytes, 0);
                 e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);
 
-                if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-                    Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
-
                 // Need to find AA FF and have 
                 for (int i = 0; i < newBytes.Length; i++)
                 {
@@ -364,8 +361,6 @@ namespace PepperDash.Essentials.Devices.Displays
             }
             checksum = checksum & 0x000000FF; // mask off MSBs
             b[b.Length - 1] = (byte)checksum;
-            if(Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-                Debug.Console(2, this, "Sending:{0}", ComTextHelper.GetEscapedText(b));
 
             if (b[1] == 0x12)
                 LastCommandSentWasVolume = true;

essentials-framework/Essentials Devices Common/Essentials Devices Common/SetTopBox/IRSetTopBoxBase.cs

@@ -12,11 +12,12 @@ using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common
 {
     [Description("Wrapper class for an IR Set Top Box")]
-    public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl
+    public class IRSetTopBoxBase : EssentialsBridgeableDevice, ISetTopBoxControls, IRoutingOutputs, IUsageTracking, IHasPowerControl, ITvPresetsProvider
 	{
 		public IrOutputPortController IrPort { get; private set; }
 
@@ -28,7 +29,7 @@ namespace PepperDash.Essentials.Devices.Common
         public bool HasDpad { get; set; }
         public bool HasNumeric { get; set; }
 
-        public DevicePresetsModel PresetsModel { get; private set; }
+        public DevicePresetsModel TvPresets { get; private set; }
 
 		public IRSetTopBoxBase(string key, string name, IrOutputPortController portCont,
             SetTopBoxPropertiesConfig props)
@@ -66,8 +67,8 @@ namespace PepperDash.Essentials.Devices.Common
 
 		public void LoadPresets(string filePath)
 		{
-			PresetsModel = new DevicePresetsModel(Key + "-presets", this, filePath);
-			DeviceManager.AddDevice(PresetsModel);
+			TvPresets = new DevicePresetsModel(Key + "-presets", this, filePath);
+			DeviceManager.AddDevice(TvPresets);
 		}
 
 

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

@@ -1369,7 +1369,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 set
                 {
                     // If the incoming value is "On" it sets the BoolValue true, otherwise sets it false
-                    BoolValue = value == "On";
+                    BoolValue = value == "On" || value == "Standby";
                     OnValueChanged();
                 }
             }

packages.config

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