Merge pull request #924 from PepperDash/development

bring 2.0.0 dev up to current

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs

@@ -78,7 +78,7 @@ namespace PepperDash.Essentials.Core.Bridges
     /// <summary>
     /// Bridge API using EISC
     /// </summary>
-    public class EiscApiAdvanced : BridgeApi
+    public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
     {
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
@@ -98,13 +98,35 @@ namespace PepperDash.Essentials.Core.Bridges
 
             Eisc.SigChange += Eisc_SigChange;
 
+            CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, Eisc, 120000, 300000);
+
             AddPostActivationAction(LinkDevices);
+            AddPostActivationAction(LinkRooms);
+            AddPostActivationAction(RegisterEisc);
+        }
+
+        public override bool CustomActivate()
+        {
+            CommunicationMonitor.Start();
+            return base.CustomActivate();
+        }
+
+        public override bool Deactivate()
+        {
+            CommunicationMonitor.Stop();
+            return base.Deactivate();
         }
 
         private void LinkDevices()
         {
             Debug.Console(1, this, "Linking Devices...");
 
+            if (PropertiesConfig.Devices == null)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No devices linked to this bridge");
+                return;
+            }
+
             foreach (var d in PropertiesConfig.Devices)
             {
                 var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
@@ -130,6 +152,14 @@ namespace PepperDash.Essentials.Core.Bridges
                     bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                 }
             }
+        }
+
+        private void RegisterEisc()
+        {
+            if (Eisc.Registered)
+            {
+                return;
+            }
 
             var registerResult = Eisc.Register();
 
@@ -142,6 +172,31 @@ namespace PepperDash.Essentials.Core.Bridges
             Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
         }
 
+        public void LinkRooms()
+        {
+            Debug.Console(1, this, "Linking Rooms...");
+
+            if (PropertiesConfig.Rooms == null)
+            {
+                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "No rooms linked to this bridge.");
+                return;
+            }
+
+            foreach (var room in PropertiesConfig.Rooms)
+            {
+                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+                if (rm == null)
+                {
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Notice,
+                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                    continue;
+                }
+
+                rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
+            }
+        }
+
         /// <summary>
         /// Adds a join map
         /// </summary>
@@ -280,6 +335,12 @@ namespace PepperDash.Essentials.Core.Bridges
                 Debug.Console(2, this, "Error in Eisc_SigChange handler: {0}", e);
             }
         }
+
+        #region Implementation of ICommunicationMonitor
+
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+        #endregion
     }
 
     public class EiscApiPropertiesConfig
@@ -290,6 +351,9 @@ namespace PepperDash.Essentials.Core.Bridges
         [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
+        [JsonProperty("rooms")]
+        public List<ApiRoomPropertiesConfig> Rooms { get; set; } 
+
 
         public class ApiDevicePropertiesConfig
         {
@@ -303,13 +367,25 @@ namespace PepperDash.Essentials.Core.Bridges
             public string JoinMapKey { get; set; }
         }
 
+        public class ApiRoomPropertiesConfig
+        {
+            [JsonProperty("roomKey")]
+            public string RoomKey { get; set; }
+
+            [JsonProperty("joinStart")]
+            public uint JoinStart { get; set; }
+
+            [JsonProperty("joinMapKey")]
+            public string JoinMapKey { get; set; }
+        }
+
     }
 
     public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient",  "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
@@ -327,6 +403,16 @@ namespace PepperDash.Essentials.Core.Bridges
                         controlProperties.TcpSshProperties.Address, Global.ControlSystem);
                     return new EiscApiAdvanced(dc, eisc);
                 }
+                case "eiscapiadvancedserver":
+                {
+                    var eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                case "eiscapiadvancedclient":
+                {
+                    var eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
                 case "vceiscapiadv":
                 case "vceiscapiadvanced":
                 {

essentials-framework/Essentials Core/PepperDashEssentialsBase/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/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs

@@ -46,6 +46,14 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
             new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
+        [JoinName("IdentityModeOn")]
+        public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("IdentityModeFeedback")]
+        public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
         [JoinName("EnableLedFlash")]
         public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

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

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata
             {
                 Description = "DM Chassis enable audio breakaway routing",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
 
@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata
             {
                 Description = "DM Chassis enable USB breakaway routing",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
                 JoinType = eJoinType.Digital
             });
 
@@ -76,6 +76,18 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
+        [JoinName("InputStreamCardState")]
+        public JoinDataComplete InputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1501, JoinSpan = 32 },
+            new JoinMetadata { Description = "DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("OutputStreamCardState")]
+        public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
+            new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("NoRouteName")]
+        public JoinDataComplete NoRouteName = new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
         [JoinName("InputNames")]
         public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -88,7 +100,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData {JoinNumber = 501, JoinSpan = 200},
                 new JoinMetadata
                 {
-                    Description = "Video Input Name",
+                    Description = "DM Chassis Video Input Names",
                     JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                     JoinType = eJoinType.Serial
                 });
@@ -98,7 +110,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 200 },
             new JoinMetadata
             {
-                Description = "Video Input Name",
+                Description = "DM Chassis Audio Input Names",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
@@ -107,7 +119,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 200 },
             new JoinMetadata
             {
-                Description = "Video Input Name",
+                Description = "DM Chassis Video Output Names",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });
@@ -116,7 +128,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 200 },
             new JoinMetadata
             {
-                Description = "Video Input Name",
+                Description = "DM Chassis Audio Output Names",
                 JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
                 JoinType = eJoinType.Serial
             });

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

@@ -28,6 +28,10 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
         [JoinName("AudioVideoSource")]
         public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });

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

@@ -32,6 +32,10 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete CurrentInputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Current Input Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM TX Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
         [JoinName("VideoInput")]
         public JoinDataComplete VideoInput = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "DM TX Video Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
@@ -42,7 +46,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("HdcpSupportCapability")]
         public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Port1HdcpState")]
         public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },

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

@@ -7,7 +7,15 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("MasterVolumeLevel")]
         public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Master Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("MasterVolumeLevelScaled")]
+        public JoinDataComplete MasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "Master Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("MixerPresetRecall")]
+        public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("MasterVolumeMuteOn")]
         public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
@@ -23,11 +31,19 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("MasterVolumeDown")]
         public JoinDataComplete MasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Master Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MasterVolumeLevelScaledSend")]
+        public JoinDataComplete MasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("SourceVolumeLevel")]
         public JoinDataComplete SourceVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Source Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("SourceVolumeLevelScaled")]
+        public JoinDataComplete SourceVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+            new JoinMetadata { Description = "Source Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("SourceVolumeMuteOn")]
         public JoinDataComplete SourceVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
@@ -43,11 +59,19 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("SourceVolumeDown")]
         public JoinDataComplete SourceVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Source Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("SourceVolumeLevelScaledSend")]
+        public JoinDataComplete SourceVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+            new JoinMetadata { Description = "Source Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("Codec1VolumeLevel")]
         public JoinDataComplete Codec1VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Codec1 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("Codec1VolumeLevelScaled")]
+        public JoinDataComplete Codec1VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
+            new JoinMetadata { Description = "Codec1 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Codec1VolumeMuteOn")]
         public JoinDataComplete Codec1VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
@@ -63,11 +87,19 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("Codec1VolumeDown")]
         public JoinDataComplete Codec1VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Codec1 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Codec1VolumeLevelScaledSend")]
+        public JoinDataComplete Codec1VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
+            new JoinMetadata { Description = "Codec1 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         [JoinName("Codec2VolumeLevel")]
         public JoinDataComplete Codec2VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Codec2 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("Codec2VolumeLevelScaled")]
+        public JoinDataComplete Codec2VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
+            new JoinMetadata { Description = "Codec2 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Codec2VolumeMuteOn")]
         public JoinDataComplete Codec2VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
@@ -83,8 +115,39 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("Codec2VolumeDown")]
         public JoinDataComplete Codec2VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Mute Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Codec2 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
+        [JoinName("Codec2VolumeLevelScaledSend")]
+        public JoinDataComplete Codec2VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
+            new JoinMetadata { Description = "Codec2 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicsMasterVolumeLevel")]
+        public JoinDataComplete MicsMasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+            new JoinMetadata { Description = "MicsMaster Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("MicsMasterVolumeLevelScaled")]
+        public JoinDataComplete MicsMasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+            new JoinMetadata { Description = "MicsMaster Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("MicsMasterVolumeMuteOn")]
+        public JoinDataComplete MicsMasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+            new JoinMetadata { Description = "MicsMaster Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicsMasterVolumeMuteOff")]
+        public JoinDataComplete MicsMasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+            new JoinMetadata { Description = "MicsMaster Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicsMasterVolumeUp")]
+        public JoinDataComplete MicsMasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
+            new JoinMetadata { Description = "MicsMaster Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicsMasterVolumeDown")]
+        public JoinDataComplete MicsMasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
+            new JoinMetadata { Description = "MicsMaster Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicsMasterVolumeLevelScaledSend")]
+        public JoinDataComplete MicsMasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mics Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
 
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it

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

@@ -0,0 +1,50 @@
+using System;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("MicGain")]
+        public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("MicGainScaled")]
+        public JoinDataComplete MicGainScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mic Gain 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        [JoinName("MicMuteOn")]
+        public JoinDataComplete MicMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mic Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicMuteOff")]
+        public JoinDataComplete MicMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mic Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicGainScaledSend")]
+        public JoinDataComplete MicGainScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mic Gain Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("MicName")]
+        public JoinDataComplete MicName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mic Name Get", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        /// <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 DmpsMicrophoneControllerJoinMap(uint joinStart)
+            : this(joinStart, typeof(DmpsMicrophoneControllerJoinMap))
+        {
+        }
+
+        /// <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>
+        protected DmpsMicrophoneControllerJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+        }
+    }
+}

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

@@ -1,9 +1,29 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
-    {
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("EnableRouting")]
+        public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("SystemPowerOn")]
+        public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+            new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("SystemPowerOff")]
+        public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+            new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("FrontPanelLockOn")]
+        public JoinDataComplete FrontPanelLockOn = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+            new JoinMetadata { Description = "DMPS Front Panel Lock On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("FrontPanelLockOff")]
+        public JoinDataComplete FrontPanelLockOff = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+            new JoinMetadata { Description = "DMPS Front Panel Lock  Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
         [JoinName("VideoSyncStatus")]
         public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
@@ -32,6 +52,44 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
+        [JoinName("InputVideoNames")]
+        public JoinDataComplete InputVideoNames =
+            new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
+            new JoinMetadata
+            {
+                Description = "Video Input Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("InputAudioNames")]
+        public JoinDataComplete InputAudioNames =
+            new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
+            new JoinMetadata
+            {
+                Description = "Audio Input Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+        [JoinName("OutputVideoNames")]
+        public JoinDataComplete OutputVideoNames =
+            new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 32 },
+            new JoinMetadata
+            {
+                Description = "Video Output Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+        [JoinName("OutputAudioNames")]
+        public JoinDataComplete OutputAudioNames =
+            new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 32 },
+            new JoinMetadata
+            {
+                Description = "Audio Output Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
         [JoinName("OutputCurrentVideoInputNames")]
         public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
             new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
@@ -61,5 +119,5 @@ namespace PepperDash.Essentials.Core.Bridges
         protected DmpsRoutingControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
         {
         }
-    }
+    }
 }

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

@@ -154,7 +154,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("PirSensitivityInVacantState")]
         public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Occ Sensor Ultrasonic Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+            new JoinMetadata { Description = "Occ Sensor PIR Sensitivity in Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
         [JoinName("Name")]
         public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },

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

@@ -1,131 +1,290 @@
 using System;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
-	public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
-	{
-		[JoinName("IsOnline")]
-		public JoinDataComplete IsOnline = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Is Online",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+    public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
+    {
 
-		[JoinName("Name")]
-		public JoinDataComplete Name = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 1,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Name",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Serial
-			});
+        #region Digital
 
-		[JoinName("Enable")]
-		public JoinDataComplete Enable = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 2,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Enable",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Is Online",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
 
-		[JoinName("PartitionSensed")]
-		public JoinDataComplete PartitionSensed = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 3,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Partition Sensed",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        
+        [JoinName("Enable")]
+        public JoinDataComplete Enable = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 2,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Enable",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
 
-		[JoinName("PartitionNotSensed")]
-		public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 4,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Partition Not Sensed",
-				JoinCapabilities = eJoinCapabilities.ToSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        [JoinName("PartitionSensed")]
+        public JoinDataComplete PartitionSensed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 3,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Partition Sensed",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
 
-		[JoinName("IncreaseSensitivity")]
-		public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 6,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Increase Sensitivity",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        [JoinName("PartitionNotSensed")]
+        public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 4,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Partition Not Sensed",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
 
-		[JoinName("DecreaseSensitivity")]
-		public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 7,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Decrease Sensitivity",
-				JoinCapabilities = eJoinCapabilities.FromSIMPL,
-				JoinType = eJoinType.Digital
-			});
+        [JoinName("IncreaseSensitivity")]
+        public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 6,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Increase Sensitivity",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("DecreaseSensitivity")]
+        public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 7,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Decrease Sensitivity",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });        
+
+        #endregion
+
+        #region Analog
+
+        [JoinName("Sensitivity")]
+        public JoinDataComplete Sensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 2,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Sensitivity",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        #endregion
+
+
+        #region Serial
+
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        #endregion
 
-		[JoinName("Sensitivity")]
-		public JoinDataComplete Sensitivity = new JoinDataComplete(
-			new JoinData
-			{
-				JoinNumber = 2,
-				JoinSpan = 1
-			},
-			new JoinMetadata
-			{
-				Description = "Sensor Sensitivity",
-				JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-				JoinType = eJoinType.Analog
-			});
 
         /// <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 GlsPartitionSensorJoinMap(uint joinStart)
-			: this(joinStart, typeof (GlsPartitionSensorJoinMap))
-		{
+        public GlsPartitionSensorJoinMap(uint joinStart)
+            : this(joinStart, typeof(GlsPartitionSensorJoinMap))
+        {
 
-		}
+        }
+
+        /// <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>
+        protected GlsPartitionSensorJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+
+        }
+    }
+}
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Obsolete("use PepperDash.Essentials.Core.Bridges.JoinMaps version")]
+	public class GlsPartitionSensorJoinMap:JoinMapBaseAdvanced
+	{
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Is Online",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Name",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("Enable")]
+        public JoinDataComplete Enable = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 2,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Enable",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PartitionSensed")]
+        public JoinDataComplete PartitionSensed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 3,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Partition Sensed",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("PartitionNotSensed")]
+        public JoinDataComplete PartitionNotSensed = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 4,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Partition Not Sensed",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("IncreaseSensitivity")]
+        public JoinDataComplete IncreaseSensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 6,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Increase Sensitivity",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("DecreaseSensitivity")]
+        public JoinDataComplete DecreaseSensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 7,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Decrease Sensitivity",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("Sensitivity")]
+        public JoinDataComplete Sensitivity = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 2,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "Sensor Sensitivity",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        /// <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 GlsPartitionSensorJoinMap(uint joinStart)
+            : this(joinStart, typeof(GlsPartitionSensorJoinMap))
+        {
+
+        }
 
         /// <summary>
         /// Constructor to use when extending this Join map

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

@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Join map for IRBlurayBase devices
+    /// </summary>
+    public class IRBlurayBaseJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("PowerOn")]
+        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("PowerOff")]
+        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("PowerToggle")]
+        public JoinDataComplete PowerToggle = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata { Description = "Power Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Up")]
+        public JoinDataComplete Up = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Down")]
+        public JoinDataComplete Down = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Left")]
+        public JoinDataComplete Left = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Right")]
+        public JoinDataComplete Right = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+            new JoinMetadata { Description = "Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Select")]
+        public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+            new JoinMetadata { Description = "Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Menu")]
+        public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
+            new JoinMetadata { Description = "Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Exit")]
+        public JoinDataComplete Exit = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
+            new JoinMetadata { Description = "Exit", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit0")]
+        public JoinDataComplete Digit0 = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 0", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit1")]
+        public JoinDataComplete Digit1 = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 1", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit2")]
+        public JoinDataComplete Digit2 = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 2", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit3")]
+        public JoinDataComplete Digit3 = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 3", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit4")]
+        public JoinDataComplete Digit4 = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 4", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit5")]
+        public JoinDataComplete Digit5 = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 5", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit6")]
+        public JoinDataComplete Digit6 = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 6", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit7")]
+        public JoinDataComplete Digit7 = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 7", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit8")]
+        public JoinDataComplete Digit8 = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 8", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Digit9")]
+        public JoinDataComplete Digit9 = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
+            new JoinMetadata { Description = "Digit 9", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadClear")]
+        public JoinDataComplete KeypadClear = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Clear", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadEnter")]
+        public JoinDataComplete KeypadEnter = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Enter", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChannelUp")]
+        public JoinDataComplete ChannelUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
+            new JoinMetadata { Description = "STB Channel Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChannelDown")]
+        public JoinDataComplete ChannelDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
+            new JoinMetadata { Description = "STB Channel Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("LastChannel")]
+        public JoinDataComplete LastChannel = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
+            new JoinMetadata { Description = "Last Channel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Guide")]
+        public JoinDataComplete Guide = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
+            new JoinMetadata { Description = "Guide", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Info")]
+        public JoinDataComplete Info = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
+            new JoinMetadata { Description = "Info", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Red")]
+        public JoinDataComplete Red = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
+            new JoinMetadata { Description = "Red", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Green")]
+        public JoinDataComplete Green = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
+            new JoinMetadata { Description = "Green", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Yellow")]
+        public JoinDataComplete Yellow = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
+            new JoinMetadata { Description = "Yellow", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Blue")]
+        public JoinDataComplete Blue = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
+            new JoinMetadata { Description = "Blue", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+
+        [JoinName("Play")]
+        public JoinDataComplete Play = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
+            new JoinMetadata { Description = "Play", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Pause")]
+        public JoinDataComplete Pause = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
+            new JoinMetadata { Description = "Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Stop")]
+        public JoinDataComplete Stop = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
+            new JoinMetadata { Description = "Stop", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("FFwd")]
+        public JoinDataComplete FFwd = new JoinDataComplete(new JoinData { JoinNumber = 36, JoinSpan = 1 },
+            new JoinMetadata { Description = "FFwd", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Rewind")]
+        public JoinDataComplete Rewind = new JoinDataComplete(new JoinData { JoinNumber = 37, JoinSpan = 1 },
+            new JoinMetadata { Description = "Rewind", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChapPlus")]
+        public JoinDataComplete ChapPlus = new JoinDataComplete(new JoinData { JoinNumber = 38, JoinSpan = 1 },
+            new JoinMetadata { Description = "Chapter Plus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("ChapMinus")]
+        public JoinDataComplete ChapMinus = new JoinDataComplete(new JoinData { JoinNumber = 39, JoinSpan = 1 },
+            new JoinMetadata { Description = "Chapter Minus", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Replay")]
+        public JoinDataComplete Replay = new JoinDataComplete(new JoinData { JoinNumber = 40, JoinSpan = 1 },
+            new JoinMetadata { Description = "Replay", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Record")]
+        public JoinDataComplete Record = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+            new JoinMetadata { Description = "Record", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HasKeypadAccessoryButton1")]
+        public JoinDataComplete HasKeypadAccessoryButton1 = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+            new JoinMetadata { Description = "Has Keypad Accessory Button 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("HasKeypadAccessoryButton2")]
+        public JoinDataComplete HasKeypadAccessoryButton2 = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
+            new JoinMetadata { Description = "Has Keypad Accessory Button 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadAccessoryButton1Press")]
+        public JoinDataComplete KeypadAccessoryButton1Press = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 2 },
+            new JoinMetadata { Description = "Keypad Accessory Button 1 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadAccessoryButton2Press")]
+        public JoinDataComplete KeypadAccessoryButton2Press = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 2 },
+            new JoinMetadata { Description = "Keypad Accessory Button 2 Press", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("Name")]
+        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("KeypadAccessoryButton1Label")]
+        public JoinDataComplete KeypadAccessoryButton1Label = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+        [JoinName("KeypadAccessoryButton2Label")]
+        public JoinDataComplete KeypadAccessoryButton2Label = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
+            new JoinMetadata { Description = "Keypad Accessory Button 1 Label", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+                /// <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 IRBlurayBaseJoinMap(uint joinStart)
+            : this(joinStart, typeof(IRBlurayBaseJoinMap))
+        {
+        }
+
+        /// <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>
+        protected IRBlurayBaseJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+        }
+    }
+}

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

@@ -1,10 +1,10 @@
 using System;
 
 
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
-    {
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
+    {
         [JoinName("PowerOn")]
         public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "STB Power On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
@@ -236,5 +236,5 @@ namespace PepperDash.Essentials.Core.Bridges
             : base(joinStart, type)
         {
         }
-    }
+    }
 }

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

@@ -45,7 +45,7 @@ namespace PepperDash.Essentials.Core.Bridges
             new JoinMetadata { Description = "Processor Last Boot", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
         [JoinName("ProgramOffsetJoin")]
-        public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        public JoinDataComplete ProgramOffsetJoin = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 5 },
             new JoinMetadata { Description = "All Program Data is offset between slots by 5 - First Joins Start at 11", JoinCapabilities = eJoinCapabilities.None, JoinType = eJoinType.None });
 
         [JoinName("ProgramStart")]

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

@@ -11,8 +11,10 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
-    public class CecPortController : Device, IBasicCommunication
+	public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
     {
+		public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
         public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
         public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
@@ -23,6 +25,8 @@ namespace PepperDash.Essentials.Core
         public CecPortController(string key, Func<EssentialsControlPropertiesConfig, ICec> postActivationFunc,
             EssentialsControlPropertiesConfig config):base(key)
         {
+			StreamDebugging = new CommunicationStreamDebugging(key);
+
             AddPostActivationAction(() =>
             {
                 Port = postActivationFunc(config);
@@ -50,15 +54,21 @@ namespace PepperDash.Essentials.Core
 
         void OnDataReceived(string s)
         {
-            var bytesHandler = BytesReceived;
+			var bytesHandler = BytesReceived;
             if (bytesHandler != null)
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
-            if (textHandler != null)
-                textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			if (textHandler != null)
+			{
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", s);
+				textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+			}
         }
 
         #region IBasicCommunication Members
@@ -67,6 +77,8 @@ namespace PepperDash.Essentials.Core
         {
             if (Port == null)
                 return;
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
             Port.StreamCec.Send.StringValue = text;
         }
 
@@ -75,6 +87,8 @@ namespace PepperDash.Essentials.Core
             if (Port == null)
                 return;
             var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+			if (StreamDebugging.TxStreamDebuggingIsEnabled)
+				Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
             Port.StreamCec.Send.StringValue = text;
         }
 

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

@@ -56,6 +56,11 @@ namespace PepperDash.Essentials.Core
 
 	    private void RegisterAndConfigureComPort()
 	    {
+	        if (Port == null)
+	        {
+	            Debug.Console(0,this,Debug.ErrorLogLevel.Error, "Configured com Port for this device does not exist.");
+	            return;
+	        }
             if (Port.Parent is CrestronControlSystem)
             {
                 var result = Port.Register();
@@ -87,18 +92,20 @@ namespace PepperDash.Essentials.Core
 
         void OnDataReceived(string s)
         {
+
             var bytesHandler = BytesReceived;
             if (bytesHandler != null)
             {
                 var bytes = Encoding.GetEncoding(28591).GetBytes(s);
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
             }
             var textHandler = TextReceived;
             if (textHandler != null)
             {
-                if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    Debug.Console(0, this, "Recevied: '{0}'", s);
-
+				if (StreamDebugging.RxStreamDebuggingIsEnabled)
+					Debug.Console(0, this, "Received: '{0}'", s);
                 textHandler(this, new GenericCommMethodReceiveTextArgs(s));
             }
         }

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

@@ -104,7 +104,7 @@ namespace PepperDash.Essentials.Core
 			var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey);
 			if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts)
 				return dev.ComPorts[config.ControlPortNumber];
-			Debug.Console(0, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
+			Debug.Console(0,Debug.ErrorLogLevel.Notice, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber);
 			return null;
 		}
 

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

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core
 		{
 			Communication = comm;
 			PortGather = new CommunicationGather(Communication, '\x0d');
-			PortGather.LineReceived += this.Port_LineReceived;
+			//PortGather.LineReceived += this.Port_LineReceived;
 			CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
 			LineEnding = props.LineEnding;
 		}
@@ -47,13 +47,6 @@ namespace PepperDash.Essentials.Core
 			return true;
 		}
 
-		void Port_LineReceived(object dev, GenericCommMethodReceiveTextArgs args)
-		{
-			if (Debug.Level == 2)
-				Debug.Console(2, this, "RX: '{0}'", 
-					ShowHexResponse ? ComTextHelper.GetEscapedText(args.Text) : args.Text);
-		}
-
 		void SendLine(string s)
 		{
 			//if (Debug.Level == 2)

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

@@ -25,6 +25,7 @@ namespace PepperDash.Essentials.Core
         public GenericComm(DeviceConfig config)
             : base(config)
         {
+
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
 
             var commPort = CommFactory.CreateCommForDevice(config);
@@ -96,7 +97,6 @@ namespace PepperDash.Essentials.Core
             // this is a permanent event handler. This cannot be -= from event
             CommPort.TextReceived += (s, a) =>
             {
-                Debug.Console(2, this, "RX: {0}", a.Text);
                 trilist.SetString(joinMap.TextReceived.JoinNumber, a.Text);
             };
             trilist.SetStringSigAction(joinMap.SendText.JoinNumber, s => CommPort.SendText(s));

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

@@ -33,7 +33,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, path);
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request); 
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 		public void SendText(string format, params object[] items)
 		{
@@ -41,7 +40,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
 			request.Url = new UrlParser(url);
 			HttpClient.DISPATCHASYNC_ERROR error = Client.DispatchAsyncEx(request, Response, request);
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 
 		public void SendTextNoResponse(string format, params object[] items)
@@ -50,7 +48,6 @@ namespace PepperDash.Essentials.Core
 			string url = string.Format("http://{0}/{1}", Client.HostName, string.Format(format, items));
 			request.Url = new UrlParser(url);
 			Client.Dispatch(request);
-			Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url);
 		}
 
 		private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request)
@@ -63,10 +60,6 @@ namespace PepperDash.Essentials.Core
 				{
 					if (ResponseRecived != null)
 						ResponseRecived(this, new GenericHttpClientEventArgs(responseReceived.ContentString, (request as HttpClientRequest).Url.ToString(), error));
-
-					Debug.Console(2, this, "GenericHttpClient ResponseReceived");
-					Debug.Console(2, this, "RX:{0}", responseReceived.ContentString);
-					Debug.Console(2, this, "TX:{0}", (request as HttpClientRequest).Url.ToString());
 				}
 			}
 

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

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

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

@@ -30,7 +30,19 @@ namespace PepperDash.Essentials.Core.Config
 
         [JsonProperty("properties")]
         [JsonConverter(typeof(DevicePropertiesConverter))]
-        public JToken Properties { get; set; }
+        public JToken Properties { get; set; }
+
+        public DeviceConfig(DeviceConfig dc)
+        {
+            Key = dc.Key;
+            Uid = dc.Uid;
+            Name = dc.Name;
+            Group = dc.Group;
+            Type = dc.Type;
+            Properties = JToken.FromObject(dc.Properties);
+        }
+
+        public DeviceConfig() {}
     }
 
     /// <summary>

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/Config/Essentials/ConfigWriter.cs

@@ -1,162 +1,162 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core.Config
-{
-    /// <summary>
-    /// Responsible for updating config at runtime, and writing the updates out to a local file
-    /// </summary>
-    public class ConfigWriter
-    {
-        public const string LocalConfigFolder = "LocalConfig";
-
-        public const long WriteTimeout = 30000;
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    /// <summary>
+    /// Responsible for updating config at runtime, and writing the updates out to a local file
+    /// </summary>
+    public class ConfigWriter
+    {
+        public const string LocalConfigFolder = "LocalConfig";
+
+        public const long WriteTimeout = 30000;
+
         public static CTimer WriteTimer;
-		static CCriticalSection fileLock = new CCriticalSection();
-
-        /// <summary>
-        /// Updates the config properties of a device
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="properties"></param>
-        /// <returns></returns>
-        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
-        {
-            bool success = false;
-
-            // Get the current device config
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
-
-            if (deviceConfig != null)
-            {
-                // Replace the current properties JToken with the new one passed into this method
-                deviceConfig.Properties = properties;
-
-                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        public static bool UpdateDeviceConfig(DeviceConfig config)
-        {
-            bool success = false;
-
-            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(config.Key));
-
-            if (deviceConfig != null)
-            {
-                deviceConfig = config;
-
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        public static bool UpdateRoomConfig(DeviceConfig config)
-        {
-            bool success = false;
-
-            var deviceConfig = ConfigReader.ConfigObject.Rooms.FirstOrDefault(d => d.Key.Equals(config.Key));
-
-            if (deviceConfig != null)
-            {
-                deviceConfig = config;
-
-                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
-
-                success = true;
-            }
-
-            ResetTimer();
-
-            return success;
-        }
-
-        /// <summary>
-        /// Resets (or starts) the write timer
-        /// </summary>
-        static void ResetTimer()
-        {
-            if (WriteTimer == null)
-                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
-
-            WriteTimer.Reset(WriteTimeout);
-
-            Debug.Console(1, "Config File write timer has been reset.");
-        }
-
-        /// <summary>
-        /// Writes the current config to a file in the LocalConfig subfolder
-        /// </summary>
-        /// <returns></returns>
-        private static void WriteConfigFile(object o)
-        {
-            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
-
-            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
-
-            WriteFile(filePath, configData);
-        }
-
-        /// <summary>
-        /// Writes
-        /// </summary>
-        /// <param name="filepath"></param>
-        /// <param name="o"></param>
-        public static void WriteFile(string filePath, string configData)
-        {
-            if (WriteTimer != null)
-                WriteTimer.Stop();
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
-
-            try
-            {
-                if (fileLock.TryEnter())
-                {
-                    using (StreamWriter sw = new StreamWriter(filePath))
-                    {
-                        sw.Write(configData);
-                        sw.Flush();
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
-            }
-            finally
-            {
-                if (fileLock != null && !fileLock.Disposed)
-                    fileLock.Leave();
-
-            }
-        }
-
-
-    }
+		static CCriticalSection fileLock = new CCriticalSection();
+
+        /// <summary>
+        /// Updates the config properties of a device
+        /// </summary>
+        /// <param name="deviceKey"></param>
+        /// <param name="properties"></param>
+        /// <returns></returns>
+        public static bool UpdateDeviceProperties(string deviceKey, JToken properties)
+        {
+            bool success = false;
+
+            // Get the current device config
+            var deviceConfig = ConfigReader.ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(deviceKey));
+
+            if (deviceConfig != null)
+            {
+                // Replace the current properties JToken with the new one passed into this method
+                deviceConfig.Properties = properties;
+
+                Debug.Console(1, "Updated properties of device: '{0}'", deviceKey);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        public static bool UpdateDeviceConfig(DeviceConfig config)
+        {
+            bool success = false;
+
+            var deviceConfigIndex = ConfigReader.ConfigObject.Devices.FindIndex(d => d.Key.Equals(config.Key));
+
+            if (deviceConfigIndex >= 0)
+            {
+                ConfigReader.ConfigObject.Devices[deviceConfigIndex] = config;
+
+                Debug.Console(1, "Updated config of device: '{0}'", config.Key);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        public static bool UpdateRoomConfig(DeviceConfig config)
+        {
+            bool success = false;
+
+			var roomConfigIndex = ConfigReader.ConfigObject.Rooms.FindIndex(d => d.Key.Equals(config.Key));
+
+			if (roomConfigIndex >= 0)
+            {
+                ConfigReader.ConfigObject.Rooms[roomConfigIndex] = config;
+
+                Debug.Console(1, "Updated room of device: '{0}'", config.Key);
+
+                success = true;
+            }
+
+            ResetTimer();
+
+            return success;
+        }
+
+        /// <summary>
+        /// Resets (or starts) the write timer
+        /// </summary>
+        static void ResetTimer()
+        {
+            if (WriteTimer == null)
+                WriteTimer = new CTimer(WriteConfigFile, WriteTimeout);
+
+            WriteTimer.Reset(WriteTimeout);
+
+            Debug.Console(1, "Config File write timer has been reset.");
+        }
+
+        /// <summary>
+        /// Writes the current config to a file in the LocalConfig subfolder
+        /// </summary>
+        /// <returns></returns>
+        private static void WriteConfigFile(object o)
+        {
+            var filePath = Global.FilePathPrefix + LocalConfigFolder + Global.DirectorySeparator + "configurationFile.json";
+
+            var configData = JsonConvert.SerializeObject(ConfigReader.ConfigObject);
+
+            WriteFile(filePath, configData);
+        }
+
+        /// <summary>
+        /// Writes
+        /// </summary>
+        /// <param name="filepath"></param>
+        /// <param name="o"></param>
+        public static void WriteFile(string filePath, string configData)
+        {
+            if (WriteTimer != null)
+                WriteTimer.Stop();
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
+
+            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
+
+            try
+            {
+                if (fileLock.TryEnter())
+                {
+                    using (StreamWriter sw = new StreamWriter(filePath))
+                    {
+                        sw.Write(configData);
+                        sw.Flush();
+                    }
+                }
+                else
+                {
+                    Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to enter FileLock");
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: Config write failed: \r{0}", e);
+            }
+            finally
+            {
+                if (fileLock != null && !fileLock.Disposed)
+                    fileLock.Leave();
+
+            }
+        }
+
+
+    }
 }

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

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

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

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/CenIoRy104Controller.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Wrapper class for CEN-IO-RY-104 relay module
+    /// </summary>
+    [Description("Wrapper class for the CEN-IO-RY-104 relay module")]
+    public class CenIoRy104Controller : EssentialsDevice, IRelayPorts
+    {
+        private readonly CenIoRy104 _ry104;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="name"></param>
+        /// <param name="ry104"></param>
+        public CenIoRy104Controller(string key, string name, CenIoRy104 ry104)
+            : base(key, name)
+        {
+            _ry104 = ry104;
+        }
+
+        /// <summary>
+        /// Relay port collection
+        /// </summary>
+        public CrestronCollection<Relay> RelayPorts
+        {
+            get { return _ry104.RelayPorts; }
+        }
+    
+        /// <summary>
+        /// Number of relay ports property
+        /// </summary>
+        public int NumberOfRelayPorts
+        {
+            get { return _ry104.NumberOfRelayPorts; }
+        }        
+    }
+
+    /// <summary>
+    /// CEN-IO-RY Controller factory
+    /// </summary>
+    public class CenIoRy104ControllerFactory : EssentialsDeviceFactory<CenIoRy104Controller>
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public CenIoRy104ControllerFactory()
+        {
+            TypeNames = new List<string>() { "ceniory104" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create a new CEN-IO-RY-104 Device");
+
+            var controlPropertiesConfig = CommFactory.GetControlPropertiesConfig(dc);
+            if (controlPropertiesConfig == null)
+            {
+                Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device");
+                return null;
+            }
+
+            var ipid = controlPropertiesConfig.IpIdInt;
+            if (ipid != 0) return new CenIoRy104Controller(dc.Key, dc.Name, new CenIoRy104(ipid, Global.ControlSystem));
+            
+            Debug.Console(1, "Factory failed to create a new CEN-IO-RY-104 Device using IP-ID-{0}", ipid);
+            return null;
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs

@@ -44,6 +44,12 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 RelayOutput = postActivationFunc(config);
 
+                if (RelayOutput == null)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Unable to get parent relay device for device key {0} and port {1}", config.PortDeviceKey, config.PortNumber);
+                    return;
+                }
+
                 RelayOutput.Register();
 
                 RelayOutput.StateChange += RelayOutput_StateChange;
@@ -61,33 +67,36 @@ namespace PepperDash.Essentials.Core.CrestronIO
             {
                 if (!Global.ControlSystem.SupportsRelay)
                 {
-                    Debug.Console(0, "GetRelayDevice: Processor does not support relays");
+                    Debug.Console(0, "Processor does not support relays");
                     return null;
                 }
                 relayDevice = Global.ControlSystem;
+
+                return relayDevice.RelayPorts[dc.PortNumber];
             }
-            else
+            
+            var essentialsDevice = DeviceManager.GetDeviceForKey(dc.PortDeviceKey);
+            if (essentialsDevice == null)
             {
-                var relayDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IRelayPorts;
-                if (relayDev == null)
-                {
-                    Debug.Console(0, "GetRelayDevice: Device {0} is not a valid device", dc.PortDeviceKey);
-                    return null;
-                }
-                relayDevice = relayDev;
-            }
-            if (relayDevice == null)
-            {
-                Debug.Console(0, "GetRelayDevice: Device '0' is not a valid IRelayPorts Device", dc.PortDeviceKey);
+                Debug.Console(0, "Device {0} was not found in Device Manager. Check configuration or for errors with device.", dc.PortDeviceKey);
                 return null;
             }
 
-            if (dc.PortNumber > relayDevice.NumberOfRelayPorts)
-            {
-                Debug.Console(0, "GetRelayDevice: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-            }
+            relayDevice = essentialsDevice as IRelayPorts;
             
-            return relayDevice.RelayPorts[dc.PortNumber];
+            if (relayDevice == null)
+            {
+                Debug.Console(0, "Device {0} is not a valid relay parent. Please check configuration.", dc.PortDeviceKey);
+                return null;
+            }
+
+            if (dc.PortNumber <= relayDevice.NumberOfRelayPorts)
+            {
+                return relayDevice.RelayPorts[dc.PortNumber];
+            }
+
+            Debug.Console(0, "Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+            return null;
         }
 
         #endregion
@@ -200,58 +209,6 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 var portDevice = new GenericRelayDevice(dc.Key, dc.Name, GetRelay, props);
 
                 return portDevice;
-
-
-                /*
-                if (props.PortDeviceKey == "processor")
-                    portDevice = Global.ControlSystem as IRelayPorts;
-                else
-                    portDevice = DeviceManager.GetDeviceForKey(props.PortDeviceKey) as IRelayPorts;
-
-                if (portDevice == null)
-                    Debug.Console(0, "Unable to add relay device with key '{0}'. Port Device does not support relays", key);
-                else
-                {
-                    var cs = (portDevice as CrestronControlSystem);
-
-                    if (cs != null)
-                    {
-                        // The relay is on a control system processor
-                        if (!cs.SupportsRelay || props.PortNumber > cs.NumberOfRelayPorts)
-                        {
-                            Debug.Console(0, "Port Device: {0} does not support relays or does not have enough relays");
-                            return null;
-                        }
-                    }
-                    else
-                    {
-                        // The relay is on another device type
-
-                        if (props.PortNumber > portDevice.NumberOfRelayPorts)
-                        {
-                            Debug.Console(0, "Port Device: {0} does not have enough relays");
-                            return null;
-                        }
-                    }
-
-                    Relay relay = portDevice.RelayPorts[props.PortNumber];
-
-                    if (!relay.Registered)
-                    {
-                        if (relay.Register() == eDeviceRegistrationUnRegistrationResponse.Success)
-                            return new GenericRelayDevice(key, relay);
-                        else
-                            Debug.Console(0, "Attempt to register relay {0} on device with key '{1}' failed.", props.PortNumber, props.PortDeviceKey);
-                    }
-                    else
-                    {
-                        return new GenericRelayDevice(key, relay);
-                    }
-
-                    // Future: Check if portDevice is 3-series card or other non control system that supports versiports
-                }
-                */
-
             }
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -69,19 +69,28 @@ namespace PepperDash.Essentials.Core
 		public override bool CustomActivate()
 		{
             Debug.Console(0, this, "Activating");
-			if (!PreventRegistration)
-			{
+            if (!PreventRegistration)
+            {
                 //Debug.Console(1, this, "  Does not require registration. Skipping");
 
-				var response = Hardware.RegisterWithLogging(Key);
-				if (response != eDeviceRegistrationUnRegistrationResponse.Success)
-				{
-					//Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-					return false;
-				}
+                var response = Hardware.RegisterWithLogging(Key);
+                if (response != eDeviceRegistrationUnRegistrationResponse.Success)
+                {
+                    //Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
+                    return false;
+                }
 
                 IsRegistered.FireUpdate();
-			}
+            }
+            else
+            {
+                AddPostActivationAction(() =>
+                    {
+                        var response = Hardware.RegisterWithLogging(Key);
+
+                        IsRegistered.FireUpdate();
+                    });
+            }
 
             foreach (var f in Feedbacks)
             {
@@ -130,6 +139,12 @@ namespace PepperDash.Essentials.Core
 		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
 		{
             Debug.Console(2, this, "OnlineStatusChange Event.  Online = {0}", args.DeviceOnLine);
+
+            if (!Hardware.Registered)
+            {
+                return;  // protects in cases where device has been unregistered and feedbacks would attempt to access null sigs.
+            }
+
             foreach (var feedback in Feedbacks)
             {
                 if (feedback != null)

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

@@ -1,8 +1,20 @@
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+using System;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface IHasBranding
     {
         bool BrandingEnabled { get; }
         void InitializeBranding(string roomKey);
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface IHasBranding
+    {
+        bool BrandingEnabled { get; }
+        void InitializeBranding(string roomKey);
+    }
 }

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

@@ -1,6 +1,7 @@
-using PepperDash.Essentials.Core;
+using System;
+using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface IHasPhoneDialing
     {
@@ -11,4 +12,18 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         void EndPhoneCall();
         void SendDtmfToPhone(string digit);
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface IHasPhoneDialing
+    {
+        BoolFeedback PhoneOffHookFeedback { get; }
+        StringFeedback CallerIdNameFeedback { get; }
+        StringFeedback CallerIdNumberFeedback { get; }
+        void DialPhoneCall(string number);
+        void EndPhoneCall();
+        void SendDtmfToPhone(string digit);
+    }
 }

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface ILanguageDefinition
     {
@@ -15,4 +15,21 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         List<LanguageLabel> DestinationGroupNames { get; set; }
         List<LanguageLabel> RoomNames { get; set; } 
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface ILanguageDefinition
+    {
+        string LocaleName { get; set; }
+        string FriendlyName { get; set; }
+        bool Enable { get; set; }
+        List<LanguageLabel> UiLabels { get; set; }
+        List<LanguageLabel> Sources { get; set; }
+        List<LanguageLabel> Destinations { get; set; }
+        List<LanguageLabel> SourceGroupNames { get; set; }
+        List<LanguageLabel> DestinationGroupNames { get; set; }
+        List<LanguageLabel> RoomNames { get; set; }
+    }
 }

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

@@ -1,9 +1,21 @@
 using System;
-using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+   
+    public interface ILanguageProvider
+    {
+        ILanguageDefinition CurrentLanguage { get; set; }
+
+        event EventHandler CurrentLanguageChanged;
+    }
+
+}
 
 namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
 {
-        public interface ILanguageProvider
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface ILanguageProvider
     {
         ILanguageDefinition CurrentLanguage { get; set; }
 

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

@@ -8,11 +8,19 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     /// </summary>
     public interface IMobileControl : IKeyed
     {
-        void CreateMobileControlRoomBridge(EssentialsRoomBase room, IMobileControl parent);
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
 
         void LinkSystemMonitorToAppServer();
     }
 
+    /// <summary>
+    /// Describes a MobileSystemController that accepts IEssentialsRoom
+    /// </summary>
+    public interface IMobileControl3 : IMobileControl
+    {
+        void CreateMobileControlRoomBridge(IEssentialsRoom room, IMobileControl parent);
+    }
+
     /// <summary>
     /// Describes a MobileControl Room Bridge
     /// </summary>
@@ -20,6 +28,10 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     {
         event EventHandler<EventArgs> UserCodeChanged;
 
+        event EventHandler<EventArgs> UserPromptedForCode;
+
+        event EventHandler<EventArgs> ClientJoined;
+
         string UserCode { get; }
 
         string QrCodeUrl { get; }

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

@@ -1,5 +1,5 @@
 using Crestron.SimplSharpPro.DeviceSupport;
-
+using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.SmartObjects;
 
@@ -8,7 +8,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// 
 	/// </summary>
-	public interface INumericKeypad
+	public interface INumericKeypad:IKeyed
 	{
 		void Digit0(bool pressRelease);
 		void Digit1(bool pressRelease);

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

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/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/DeviceTypeInterfaces/ITvPresetsProvider.cs

@@ -0,0 +1,9 @@
+using PepperDash.Essentials.Core.Presets;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface ITvPresetsProvider
+    {
+        DevicePresetsModel TvPresets { get; }
+    }
+}

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

@@ -1,6 +1,7 @@
-using PepperDash.Core;
+using System;
+using PepperDash.Core;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public class LanguageLabel
     {
@@ -9,4 +10,16 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         public string DisplayText { get; set; }
         public uint JoinNumber { get; set; }
     }
+}
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public class LanguageLabel
+    {
+        public string Key { get; set; }
+        public string Description { get; set; }
+        public string DisplayText { get; set; }
+        public uint JoinNumber { get; set; }
+    }
 }

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

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

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

@@ -20,8 +20,23 @@ namespace PepperDash.Essentials.Core
 		/// <param name="json"></param>
 		public static void DoDeviceActionWithJson(string json)
 		{
-			var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
-			DoDeviceAction(action);
+		    if (String.IsNullOrEmpty(json))
+		    {
+		        CrestronConsole.ConsoleCommandResponse(
+		            "Please provide a JSON object matching the format {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}.\r\nIf the method has no parameters, the \"params\" object may be omitted.");
+		        return;
+		    }
+		    try
+		    {
+		        var action = JsonConvert.DeserializeObject<DeviceActionWrapper>(json);
+
+		        DoDeviceAction(action);
+		    }
+		    catch (Exception ex)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Incorrect format for JSON. Please check that the format matches {\"deviceKey\":\"myDevice\", \"methodName\":\"someMethod\", \"params\": [\"param1\", true]}");
+		    }
+		    
 		}
 
 
@@ -33,31 +48,65 @@ namespace PepperDash.Essentials.Core
 		{
 			var key = action.DeviceKey;
 			var obj = FindObjectOnPath(key);
-			if (obj == null)
-				return;
+		    if (obj == null)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Unable to find object at path {0}", key);
+		        return;
+		    }
 
-			CType t = obj.GetType();
-			var method = t.GetMethod(action.MethodName);
-			if (method == null)
-			{
-				Debug.Console(0, "Method '{0}' not found", action.MethodName);
-				return;
-			}
-			var mParams = method.GetParameters();
-			// Add empty params if not provided
-			if (action.Params == null) action.Params = new object[0];
-			if (mParams.Length > action.Params.Length)
-			{
-				Debug.Console(0, "Method '{0}' requires {1} params", action.MethodName, mParams.Length);
-				return;
-			}
-			object[] convertedParams = mParams
-								.Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
-									System.Globalization.CultureInfo.InvariantCulture))
-								.ToArray();
-			object ret = method.Invoke(obj, convertedParams);
+		    if (action.Params == null)
+		    {
+                //no params, so setting action.Params to empty array
+		        action.Params = new object[0];
+		    }
+
+		    CType t = obj.GetType();
+		    try
+		    {
+		        var methods = t.GetMethods().Where(m => m.Name == action.MethodName).ToList();
+
+		        var method = methods.Count == 1 ? methods[0] : methods.FirstOrDefault(m => m.GetParameters().Length == action.Params.Length);
+
+		        if (method == null)
+		        {
+		            CrestronConsole.ConsoleCommandResponse(
+		                "Unable to find method with name {0} and that matches parameters {1}", action.MethodName,
+		                action.Params);
+		            return;
+		        }
+                var mParams = method.GetParameters();
+
+                var convertedParams = mParams
+                                    .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
+                                    .ToArray();
+                method.Invoke(obj, convertedParams);
+
+		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
+		            action.DeviceKey);
+		    }
+		    catch (Exception ex)
+		    {
+		        CrestronConsole.ConsoleCommandResponse("Unable to call method with name {0}. {1}", action.MethodName,
+		            ex.Message);}
 		}
 
+	    private static object ConvertType(object value, Type conversionType)
+	    {
+	        if (!conversionType.IsEnum)
+	        {
+	            return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
+	        }
+
+	        var stringValue = Convert.ToString(value);
+
+	        if (String.IsNullOrEmpty(stringValue))
+	        {
+	            throw new InvalidCastException(
+	                String.Format("{0} cannot be converted to a string prior to conversion to enum"));
+	        }
+	        return Enum.Parse(conversionType, stringValue, true);
+	    }
+
 		/// <summary>
 		/// Gets the properties on a device
 		/// </summary>
@@ -83,13 +132,13 @@ namespace PepperDash.Essentials.Core
         /// <returns></returns>
         public static object GetPropertyByName(string deviceObjectPath, string propertyName)
         {
-            var obj = FindObjectOnPath(deviceObjectPath);
-            if(obj == null)
+            var dev = FindObjectOnPath(deviceObjectPath);
+            if(dev == null)
                 return "{ \"error\":\"No Device\"}";
+	
+            object prop = dev.GetType().GetCType().GetProperty(propertyName).GetValue(dev, null);
 
-            CType t = obj.GetType();
-
-            var prop = t.GetProperty(propertyName);
+            // var prop = t.GetProperty(propertyName);
             if (prop != null)
             {
                 return prop;
@@ -242,6 +291,8 @@ namespace PepperDash.Essentials.Core
             //var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
             //return JsonConvert.SerializeObject(props, Formatting.Indented);
         }
+
+        
 	}
 
 	public class DeviceActionWrapper

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

@@ -46,7 +46,7 @@ namespace PepperDash.Essentials.Core
             CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
                 "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(SetDeviceStreamDebugging, "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(s => DisableAllDeviceStreamDebugging(), "disableallstreamdebug", "disables stream debugging on all devices", ConsoleAccessLevelEnum.AccessOperator);
         }
 
@@ -60,6 +60,7 @@ namespace PepperDash.Essentials.Core
 		        DeviceCriticalSection.Enter();
                 AddDeviceEnabled = false;
 		        // PreActivate all devices
+                Debug.Console(0,"****PreActivation starting...****");
 		        foreach (var d in Devices.Values)
 		        {
 		            try
@@ -69,9 +70,12 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-		                Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
+                        Debug.Console(0, d, "ERROR: Device {1} PreActivation failure: {0}", e.Message, d.Key);
+                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
 		            }
 		        }
+                Debug.Console(0, "****PreActivation complete****");
+		        Debug.Console(0, "****Activation starting...****");
 
 		        // Activate all devices
 		        foreach (var d in Devices.Values)
@@ -83,10 +87,14 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-		                Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
+                        Debug.Console(0, d, "ERROR: Device {1} Activation failure: {0}", e.Message, d.Key);
+                        Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
 		            }
 		        }
 
+                Debug.Console(0, "****Activation complete****");
+                Debug.Console(0, "****PostActivation starting...****");
+
 		        // PostActivate all devices
 		        foreach (var d in Devices.Values)
 		        {
@@ -97,10 +105,13 @@ namespace PepperDash.Essentials.Core
 		            }
 		            catch (Exception e)
 		            {
-		                Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
+		                Debug.Console(0, d, "ERROR: Device {1} PostActivation failure: {0}", e.Message, d.Key);
+		                Debug.Console(1, d, "Stack Trace: {0}", e.StackTrace);
 		            }
 		        }
 
+                Debug.Console(0, "****PostActivation complete****");
+
                 OnAllDevicesActivated();
 		    }
 		    finally
@@ -360,9 +371,9 @@ namespace PepperDash.Essentials.Core
 	    {
 	        var device = GetDeviceForKey(s);
 
-	        if (device == null) return;
-	        var inputPorts = (device as IRoutingInputsOutputs).InputPorts;
-	        var outputPorts = (device as IRoutingInputsOutputs).OutputPorts;
+            if (device == null) return;
+            var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
+            var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
 	        if (inputPorts != null)
 	        {
 	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
@@ -387,6 +398,15 @@ namespace PepperDash.Essentials.Core
         /// <param name="s"></param>
         public static void SetDeviceStreamDebugging(string s)
         {
+            if (String.IsNullOrEmpty(s) || s.Contains("?"))
+            {
+                CrestronConsole.ConsoleCommandResponse(
+                    @"SETDEVICESTREAMDEBUG [{deviceKey}] [OFF |TX | RX | BOTH] [timeOutInMinutes]
+    {deviceKey} [OFF | TX | RX | BOTH] - Device to set stream debugging on, and which setting to use
+    timeOutInMinutes - Set timeout for stream debugging. Default is 30 minutes");
+                return;
+            }
+
             var args = s.Split(' ');
 
             var deviceKey = args[0];
@@ -426,7 +446,7 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)
@@ -437,7 +457,7 @@ namespace PepperDash.Essentials.Core
             else
             {
                 device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
+                Debug.Console(0, "Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

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

@@ -1,113 +1,134 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
-    /// </summary>
-    [Description("The base Essentials Device Class")]
-    public abstract class EssentialsDevice : Device
-    {
-        protected EssentialsDevice(string key)
-            : base(key)
-        {
-
-        }
-
-        protected EssentialsDevice(string key, string name)
-            : base(key, name)
-        {
-
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class DescriptionAttribute : Attribute
-    {
-        private string _Description;
-
-        public DescriptionAttribute(string description)
-        {
-            Debug.Console(2, "Setting Description: {0}", description);
-            _Description = description;
-        }
-
-        public string Description
-        {
-            get { return _Description; }
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
-    public class ConfigSnippetAttribute : Attribute
-    {
-        private string _ConfigSnippet;
-
-        public ConfigSnippetAttribute(string configSnippet)
-        {
-            Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
-            _ConfigSnippet = configSnippet;
-        }
-
-        public string ConfigSnippet
-        {
-            get { return _ConfigSnippet; }
-        }
-    }
-
-    /// <summary>
-    /// Devices the basic needs for a Device Factory
-    /// </summary>
-    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
-    {
-        #region IDeviceFactory Members
-
-        /// <summary>
-        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
-        /// </summary>
-        public List<string> TypeNames { get; protected set; }
-
-        /// <summary>
-        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
-        /// </summary>
-        public void LoadTypeFactories()
-        {
-            foreach (var typeName in TypeNames)
-            {
-                Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
-                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
+    /// </summary>
+    [Description("The base Essentials Device Class")]
+    public abstract class EssentialsDevice : Device
+    {
+        protected EssentialsDevice(string key)
+            : base(key)
+        {
+            SubscribeToActivateComplete();
+        }
+
+        protected EssentialsDevice(string key, string name)
+            : base(key, name)
+        {
+            SubscribeToActivateComplete();
+        }
+
+        private void SubscribeToActivateComplete()
+        {
+            DeviceManager.AllDevicesActivated += DeviceManagerOnAllDevicesActivated;
+        }
+
+        private void DeviceManagerOnAllDevicesActivated(object sender, EventArgs eventArgs)
+        {
+            CrestronInvoke.BeginInvoke((o) =>
+            {
+                try
+                {
+                    Initialize();
+                }
+                catch (Exception ex)
+                {
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Error, "Exception initializing device: {0}", ex.Message);
+                    Debug.Console(1, this, Debug.ErrorLogLevel.Error, "Stack Trace: {0}", ex.StackTrace);
+                }
+            });
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+    public class DescriptionAttribute : Attribute
+    {
+        private string _Description;
+
+        public DescriptionAttribute(string description)
+        {
+            //Debug.Console(2, "Setting Description: {0}", description);
+            _Description = description;
+        }
+
+        public string Description
+        {
+            get { return _Description; }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+    public class ConfigSnippetAttribute : Attribute
+    {
+        private string _ConfigSnippet;
+
+        public ConfigSnippetAttribute(string configSnippet)
+        {
+            //Debug.Console(2, "Setting Config Snippet {0}", configSnippet);
+            _ConfigSnippet = configSnippet;
+        }
+
+        public string ConfigSnippet
+        {
+            get { return _ConfigSnippet; }
+        }
+    }
+
+    /// <summary>
+    /// Devices the basic needs for a Device Factory
+    /// </summary>
+    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
+    {
+        #region IDeviceFactory Members
+
+        /// <summary>
+        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
+        /// </summary>
+        public List<string> TypeNames { get; protected set; }
+
+        /// <summary>
+        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
+        /// </summary>
+        public void LoadTypeFactories()
+        {
+            foreach (var typeName in TypeNames)
+            {
+                //Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
                 string description = descriptionAttribute[0].Description;
-                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
-                DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
-            }
-        }
-
-        /// <summary>
-        /// The method that will build the device
-        /// </summary>
-        /// <param name="dc">The device config</param>
-        /// <returns>An instance of the device</returns>
-        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
-
-        #endregion
-    }
-
-    /// <summary>
-    /// Devices the basic needs for a Device Factory
-    /// </summary>
-    public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
-    {
-        /// <summary>
-        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
-        /// </summary>
-        public string MinimumEssentialsFrameworkVersion { get; protected set; }
-    }
+                var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
+                DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
+            }
+        }
+
+        /// <summary>
+        /// The method that will build the device
+        /// </summary>
+        /// <param name="dc">The device config</param>
+        /// <returns>An instance of the device</returns>
+        public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Devices the basic needs for a Device Factory
+    /// </summary>
+    public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
+    {
+        /// <summary>
+        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
+        /// </summary>
+        public string MinimumEssentialsFrameworkVersion { get; protected set; }
+    }
 }

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

@@ -7,7 +7,7 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 
-namespace PepperDash_Essentials_Core.Devices
+namespace PepperDash.Essentials.Core.Devices
 {
     public class GenericIrController: EssentialsBridgeableDevice
     {

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

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core

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

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

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

@@ -7,25 +7,53 @@ using Crestron.SimplSharp;
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
-	/// Defines minimal volume control methods
+	/// Defines minimal volume and mute control methods
 	/// </summary>
-	public interface IBasicVolumeControls
+    public interface IBasicVolumeControls : IHasVolumeControl, IHasMuteControl
 	{
-		void VolumeUp(bool pressRelease);
-		void VolumeDown(bool pressRelease);
-		void MuteToggle();
 	}
 
+    /// <summary>
+    /// Defines basic volume control methods
+    /// </summary>
+    public interface IHasVolumeControl
+    {
+        void VolumeUp(bool pressRelease);
+        void VolumeDown(bool pressRelease);
+    }
+
+    /// <summary>
+    /// Defines volume control methods and properties with feedback
+    /// </summary>
+    public interface IHasVolumeControlWithFeedback : IHasVolumeControl
+    {
+        void SetVolume(ushort level);
+        IntFeedback VolumeLevelFeedback { get; }
+    }
+
+    /// <summary>
+    /// Defines basic mute control methods
+    /// </summary>
+    public interface IHasMuteControl
+    {
+        void MuteToggle();
+    }
+
+    /// <summary>
+    /// Defines mute control methods and properties with feedback
+    /// </summary>
+    public interface IHasMuteControlWithFeedback : IHasMuteControl
+    {
+        BoolFeedback MuteFeedback { get; }
+        void MuteOn();
+        void MuteOff();
+    }
+
 	/// <summary>
 	/// Adds feedback and direct volume level set to IBasicVolumeControls
 	/// </summary>
-	public interface IBasicVolumeWithFeedback : IBasicVolumeControls
+    public interface IBasicVolumeWithFeedback : IBasicVolumeControls, IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
 	{
-		void SetVolume(ushort level);
-		void MuteOn();
-		void MuteOff();
-		IntFeedback VolumeLevelFeedback { get; }
-		BoolFeedback MuteFeedback { get; }
 	}
 
     /// <summary>

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

@@ -7,13 +7,15 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace PepperDash.Essentials.Core.Devices
 {
     /// <summary>
     /// 
     /// </summary>
-    public abstract class ReconfigurableDevice : EssentialsDevice
+    public abstract class ReconfigurableDevice : EssentialsDevice, IReconfigurableDevice
     {
         public event EventHandler<EventArgs> ConfigChanged;
 
@@ -52,6 +54,8 @@ namespace PepperDash.Essentials.Core.Devices
                 Name = config.Name;
         }
 
+
+
         /// <summary>
         /// Used by the extending class to allow for any custom actions to be taken (tell the ConfigWriter to write config, etc)
         /// </summary>

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

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

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

@@ -20,7 +20,8 @@ namespace PepperDash.Essentials.Core
 		public IrOutputPortController IrPort { get; private set; }
 		public ushort IrPulseTime { get; set; }
 
-        public BoolFeedback PowerIsOnFeedback { get; private set; }
+        [Obsolete("This property will be removed in version 2.0.0")]
+        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
 
         protected Func<bool> PowerIsOnFeedbackFunc
         {

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

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// 
 	/// </summary>
-    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking
+    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking, IPower
 	{
         public event SourceInfoChangeHandler CurrentSourceChange;
 
@@ -49,6 +49,9 @@ namespace PepperDash.Essentials.Core
 		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
 		public BoolFeedback IsWarmingUpFeedback { get; private set; }
 
+        [Obsolete("This property will be removed in version 2.0.0")]
+        public abstract BoolFeedback PowerIsOnFeedback { get; protected set; }
+
         public UsageTracking UsageTracker { get; set; }
 
 		public uint WarmupTime { get; set; }
@@ -81,8 +84,6 @@ namespace PepperDash.Essentials.Core
 
 		}
 
-
-
 		public abstract void PowerOn();
 		public abstract void PowerOff();
 		public abstract void PowerToggle();
@@ -99,7 +100,7 @@ namespace PepperDash.Essentials.Core
 			}
 		}
 
-		public abstract void ExecuteSwitch(object selector);
+	    public abstract void ExecuteSwitch(object selector);
 
 	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
 	        EiscApiAdvanced bridge)
@@ -261,7 +262,8 @@ namespace PepperDash.Essentials.Core
 
         abstract protected Func<string> CurrentInputFeedbackFunc { get; }
 
-        public BoolFeedback PowerIsOnFeedback { get; protected set; }
+        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
+
         abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
 
 
@@ -315,7 +317,5 @@ namespace PepperDash.Essentials.Core
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
         }
-
-
 	}
 }

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

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Extensions/JsonExtensions.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace PepperDash.Essentials.Core
+{
+    public static class JsonExtensions
+    {
+        public static List<JToken> FindTokens(this JToken containerToken, string name)
+        {
+            List<JToken> matches = new List<JToken>();
+            FindTokens(containerToken, name, matches);
+            return matches;
+        }
+
+        private static void FindTokens(JToken containerToken, string name, List<JToken> matches)
+        {
+            if (containerToken.Type == JTokenType.Object)
+            {
+                foreach (JProperty child in containerToken.Children<JProperty>())
+                {
+                    if (child.Name == name)
+                    {
+                        matches.Add(child.Value);
+                    }
+                    FindTokens(child.Value, name, matches);
+                }
+            }
+            else if (containerToken.Type == JTokenType.Array)
+            {
+                foreach (JToken child in containerToken.Children())
+                {
+                    FindTokens(child, name, matches);
+                }
+            }
+        }
+    }
+}

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

@@ -1,149 +1,208 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.GeneralIO;
-using Crestron.SimplSharp.Reflection;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.CrestronIO;
-using PepperDash.Essentials.Core.Touchpanels;
-
-namespace PepperDash.Essentials.Core
-{
-    public class DeviceFactoryWrapper
-    {
-        public CType CType { get; set; }
-        public string Description { get; set; }
-        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
-
-        public DeviceFactoryWrapper()
-        {
-            CType = null;
-            Description = "Not Available";
-        }
-    }
-
-    public class DeviceFactory
-    {
-        public DeviceFactory()
-        {
-            var assy = Assembly.GetExecutingAssembly();
-            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
-
-            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
-
-            if (types != null)
-            {
-                foreach (var type in types)
-                {
-                    try
-                    {
-                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                        factory.LoadTypeFactories();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
-                    }
-                }
-            }
-        }
-
-		/// <summary>
-		/// A dictionary of factory methods, keyed by config types, added by plugins.
-		/// These methods are looked up and called by GetDevice in this class.
-		/// </summary>
-		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
-            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Adds a plugin factory method
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
-		{
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
-		}
-
-        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
-        {
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
-
-            if(FactoryMethods.ContainsKey(typeName))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
-                return;
-            }
-
-            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
-            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
-        }
-
-		/// <summary>
-		/// The factory method for Core "things". Also iterates the Factory methods that have
-		/// been loaded from plugins
-		/// </summary>
-		/// <param name="dc"></param>
-		/// <returns></returns>
-        public static IKeyed GetDevice(DeviceConfig dc)
-        {
-            var key = dc.Key;
-            var name = dc.Name;
-            var type = dc.Type;
-            var properties = dc.Properties;	
-
-            var typeName = dc.Type.ToLower();
-
-            // Check for types that have been added by plugin dlls. 
-            if (FactoryMethods.ContainsKey(typeName))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
-                return FactoryMethods[typeName].FactoryMethod(dc);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Prints the type names and associated metadata from the FactoryMethods collection.
-        /// </summary>
-        /// <param name="command"></param>
-        public static void GetDeviceFactoryTypes(string filter)
-        {
-            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
-
-            if (!string.IsNullOrEmpty(filter))
-            {
-                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
-            }
-            else
-            {
-                types = FactoryMethods;
-            }
-
-            Debug.Console(0, "Device Types:");
-
-            foreach (var type in types.OrderBy(t => t.Key))
-            {
-                var description = type.Value.Description;
-                var cType = "Not Specified by Plugin";
-
-                if(type.Value.CType != null)
-                {
-                    cType = type.Value.CType.FullName;
-                }
-
-                Debug.Console(0, 
-                    @"Type: '{0}' 
-                    CType: '{1}' 
-                    Description: {2}", type.Key, cType, description);
-            }
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.GeneralIO;
+using Crestron.SimplSharp.Reflection;
+using PepperDash.Core;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.CrestronIO;
+using PepperDash.Essentials.Core.Touchpanels;
+
+namespace PepperDash.Essentials.Core
+{
+    public class DeviceFactoryWrapper
+    {
+        public CType CType { get; set; }
+        public string Description { get; set; }
+        public Func<DeviceConfig, IKeyed> FactoryMethod { get; set; }
+
+        public DeviceFactoryWrapper()
+        {
+            CType = null;
+            Description = "Not Available";
+        }
+    }
+
+    public class DeviceFactory
+    {
+        public DeviceFactory()
+        {
+            var assy = Assembly.GetExecutingAssembly();
+            PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);
+
+            var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract);
+
+            if (types != null)
+            {
+                foreach (var type in types)
+                {
+                    try
+                    {
+                        var factory = (IDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                        factory.LoadTypeFactories();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
+                    }
+                }
+            }
+        }
+
+		/// <summary>
+		/// A dictionary of factory methods, keyed by config types, added by plugins.
+		/// These methods are looked up and called by GetDevice in this class.
+		/// </summary>
+		static Dictionary<string, DeviceFactoryWrapper> FactoryMethods =
+            new Dictionary<string, DeviceFactoryWrapper>(StringComparer.OrdinalIgnoreCase);
+
+		/// <summary>
+		/// Adds a plugin factory method
+		/// </summary>
+		/// <param name="dc"></param>
+		/// <returns></returns>
+		public static void AddFactoryForType(string typeName, Func<DeviceConfig, IKeyed> method) 
+		{
+            //Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+            DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method});
+		}
+
+        public static void AddFactoryForType(string typeName, string description, CType cType, Func<DeviceConfig, IKeyed> method)
+        {
+            //Debug.Console(1, Debug.ErrorLogLevel.Notice, "Adding factory method for type '{0}'", typeName);
+
+            if(FactoryMethods.ContainsKey(typeName))
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to add type: '{0}'.  Already exists in DeviceFactory", typeName);
+                return;
+            }
+
+            var wrapper = new DeviceFactoryWrapper() { CType = cType, Description = description, FactoryMethod = method };
+            DeviceFactory.FactoryMethods.Add(typeName, wrapper);
+        }
+
+        private static void CheckForSecrets(IEnumerable<JProperty> obj)
+        {
+            foreach (var prop in obj.Where(prop => prop.Value as JObject != null))
+            {
+                if (prop.Name.ToLower() == "secret")
+                {
+                    var secret = GetSecret(prop.Children().First().ToObject<SecretsPropertiesConfig>());
+                    //var secret = GetSecret(JsonConvert.DeserializeObject<SecretsPropertiesConfig>(prop.Children().First().ToString()));
+                    prop.Parent.Replace(secret);
+                }
+                var recurseProp = prop.Value as JObject;
+                if (recurseProp == null) return;
+                CheckForSecrets(recurseProp.Properties());
+            }
+        }
+
+        private static string GetSecret(SecretsPropertiesConfig data)
+        {
+            var secretProvider = SecretsManager.GetSecretProviderByKey(data.Provider);
+            if (secretProvider == null) return null;
+            var secret = secretProvider.GetSecret(data.Key);
+            if (secret != null) return (string) secret.Value;
+            Debug.Console(1,
+                "Unable to retrieve secret {0}{1} - Make sure you've added it to the secrets provider",
+                data.Provider, data.Key);
+            return String.Empty;
+        }
+
+
+        /// <summary>
+        /// The factory method for Core "things". Also iterates the Factory methods that have
+        /// been loaded from plugins
+        /// </summary>
+        /// <param name="dc"></param>
+        /// <returns></returns>
+        public static IKeyed GetDevice(DeviceConfig dc)
+        {
+            try
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading '{0}' from Essentials Core", dc.Type);
+
+                var localDc = new DeviceConfig(dc);
+
+                var key = localDc.Key;
+                var name = localDc.Name;
+                var type = localDc.Type;
+                var properties = localDc.Properties;
+                //var propRecurse = properties;
+
+                var typeName = localDc.Type.ToLower();
+
+
+                var jObject = properties as JObject;
+                if (jObject != null)
+                {
+                    var jProp = jObject.Properties();
+
+                    CheckForSecrets(jProp);
+                }
+
+                Debug.Console(2, "typeName = {0}", typeName);
+                // Check for types that have been added by plugin dlls. 
+                return !FactoryMethods.ContainsKey(typeName) ? null : FactoryMethods[typeName].FactoryMethod(localDc);
+            }
+            catch (Exception ex)
+            {
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Exception occurred while creating device {0}: {1}", dc.Key, ex.Message);
+
+                Debug.Console(2, "{0}", ex.StackTrace);
+
+                if (ex.InnerException == null)
+                {
+                    return null;
+                }
+
+                Debug.Console(0, Debug.ErrorLogLevel.Error, "Inner exception while creating device {0}: {1}", dc.Key,
+                    ex.InnerException.Message);
+                Debug.Console(2, "{0}", ex.InnerException.StackTrace);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Prints the type names and associated metadata from the FactoryMethods collection.
+        /// </summary>
+        /// <param name="command"></param>
+        public static void GetDeviceFactoryTypes(string filter)
+        {
+            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+
+            if (!string.IsNullOrEmpty(filter))
+            {
+                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
+            }
+            else
+            {
+                types = FactoryMethods;
+            }
+
+            Debug.Console(0, "Device Types:");
+
+            foreach (var type in types.OrderBy(t => t.Key))
+            {
+                var description = type.Value.Description;
+                var cType = "Not Specified by Plugin";
+
+                if(type.Value.CType != null)
+                {
+                    cType = type.Value.CType.FullName;
+                }
+
+                Debug.Console(0, 
+                    @"Type: '{0}' 
+                    CType: '{1}' 
+                    Description: {2}", type.Key, cType, description);
+            }
+        }
+    }
 }

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

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core
+namespace PepperDash.Essentials.Core
 {
     public class IsReadyEventArgs : EventArgs
     {
@@ -16,6 +17,27 @@ namespace PepperDash_Essentials_Core
         }
     }
 
+    public interface IHasReady
+    {
+        event EventHandler<IsReadyEventArgs> IsReadyEvent;
+        bool IsReady { get; }
+    }
+}
+
+namespace PepperDash_Essentials_Core
+{
+    [Obsolete("Use PepperDash.Essentials.Core")]
+    public class IsReadyEventArgs : EventArgs
+    {
+        public bool IsReady { get; set; }
+
+        public IsReadyEventArgs(bool data)
+        {
+            IsReady = data;
+        }
+    }
+
+    [Obsolete("Use PepperDash.Essentials.Core")]
     public interface IHasReady
     {
         event EventHandler<IsReadyEventArgs> IsReadyEvent;

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolFeedback.cs

@@ -62,6 +62,11 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
+        public void SetValueFunc(Func<bool> newFunc)
+        {
+            ValueFunc = newFunc;
+        }
+
         public override void FireUpdate()
         {
             bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolOutputLogicals.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Core
 
 		protected bool ComputedValue;
 
-		public BoolFeedbackLogic()
+	    protected BoolFeedbackLogic()
 		{
 			Output = new BoolFeedback(() => ComputedValue);
 		}	
@@ -40,21 +40,18 @@ namespace PepperDash.Essentials.Core
 
 		public void AddOutputsIn(List<BoolFeedback> outputs)
 		{
-			foreach (var o in outputs)
-			{
-				// skip existing
-				if (OutputsIn.Contains(o)) continue;
-			
-				OutputsIn.Add(o);
-				o.OutputChange += AnyInput_OutputChange;
-			}
-			Evaluate();
+		    foreach (var o in outputs.Where(o => !OutputsIn.Contains(o)))
+		    {
+		        OutputsIn.Add(o);
+		        o.OutputChange += AnyInput_OutputChange;
+		    }
+		    Evaluate();
 		}
 
-		public void RemoveOutputIn(BoolFeedback output)
+	    public void RemoveOutputIn(BoolFeedback output)
 		{
 			// Don't double up outputs
-			if (OutputsIn.Contains(output)) return;
+			if (!OutputsIn.Contains(output)) return;
 
 			OutputsIn.Remove(output);
 			output.OutputChange -= AnyInput_OutputChange;
@@ -71,6 +68,12 @@ namespace PepperDash.Essentials.Core
 			Evaluate();
 		}
 
+	    public void ClearOutputs()
+	    {
+	        OutputsIn.Clear();
+            Evaluate();
+	    }
+
 		void AnyInput_OutputChange(object sender, EventArgs e)
 		{
 			Evaluate();
@@ -85,11 +88,12 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.All(o => o.BoolValue);
-			if (newValue != prevValue)
-			{
-				ComputedValue = newValue;
-				Output.FireUpdate();
-			}
+		    if (newValue == prevValue)
+		    {
+		        return;
+		    }
+		    ComputedValue = newValue;
+		    Output.FireUpdate();
 		}
 	}
 
@@ -99,33 +103,35 @@ namespace PepperDash.Essentials.Core
 		{
 			var prevValue = ComputedValue;
 			var newValue = OutputsIn.Any(o => o.BoolValue);
-			if (newValue != prevValue)
-			{
-				ComputedValue = newValue;
-				Output.FireUpdate();
-			}
+		    if (newValue == prevValue)
+		    {
+		        return;
+		    }
+		    ComputedValue = newValue;
+		    Output.FireUpdate();
 		}
 	}
 
 	public class BoolFeedbackLinq : BoolFeedbackLogic
 	{
-		Func<IEnumerable<BoolFeedback>, bool> Predicate;
+	    readonly Func<IEnumerable<BoolFeedback>, bool> _predicate;
 
 		public BoolFeedbackLinq(Func<IEnumerable<BoolFeedback>, bool> predicate)
 			: base()
 		{
-			Predicate = predicate;
+			_predicate = predicate;
 		}
 
 		protected override void Evaluate()
 		{
 			var prevValue = ComputedValue;
-			var newValue = Predicate(OutputsIn);
-			if (newValue != prevValue)
-			{
-				ComputedValue = newValue;
-				Output.FireUpdate();
-			}
+			var newValue = _predicate(OutputsIn);
+		    if (newValue == prevValue)
+		    {
+		        return;
+		    }
+		    ComputedValue = newValue;
+		    Output.FireUpdate();
 		} 
 	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntFeedback.cs

@@ -51,6 +51,12 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
+        public void SetValueFunc(Func<int> newFunc)
+        {
+            ValueFunc = newFunc;
+        }
+
+
         public override void FireUpdate()
         {
             var newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringFeedback.cs

@@ -52,7 +52,10 @@ namespace PepperDash.Essentials.Core
             ValueFunc = valueFunc;
         }
 
-
+        public void SetValueFunc(Func<string> newFunc)
+        {
+            ValueFunc = newFunc;
+        }
 
         public override void FireUpdate()
         {

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/Fusion/FusionCustomPropertiesBridge.cs

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

essentials-framework/Essentials Core/PepperDashEssentialsBase/Gateways/CenRfgwController.cs

@@ -10,9 +10,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash_Essentials_Core;
 
 
 namespace PepperDash.Essentials.Core

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

@@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using System.Globalization;
 using Crestron.SimplSharp;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronIO;
@@ -26,6 +27,33 @@ namespace PepperDash.Essentials.Core
 
 		public static LicenseManager LicenseManager { get; set; }
 
+        public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
+
+        // TODO: consider making this configurable later
+        public static IFormatProvider Culture = CultureInfo.CreateSpecificCulture("en-US");
+
+        /// <summary>
+        /// True when the processor type is a DMPS variant
+        /// </summary>
+        public static bool ControlSystemIsDmpsType
+        {
+            get
+            {
+                return ControlSystem.ControllerPrompt.ToLower().IndexOf("dmps") > -1;
+            }
+        }
+
+        /// <summary>
+        /// True when the processor type is a DMPS 4K variant
+        /// </summary>
+        public static bool ControlSystemIsDmps4kType
+        {
+            get
+            {
+                return ControlSystemIsDmpsType && ControlSystem.ControllerPrompt.ToLower().IndexOf("4k") > -1;
+            }
+        }
+
         /// <summary>
         /// The file path prefix to the folder containing configuration files
         /// </summary>

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

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
+using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharp.Scheduler;
 
 using PepperDash.Core;
+using PepperDash.Essentials.Core.Fusion;
+using PepperDash.Essentials.Room.Config;
+using Activator = System.Activator;
 
 namespace PepperDash.Essentials.Core
 {
@@ -14,13 +17,17 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public static class Scheduler
     {
-        private static Dictionary<string, ScheduledEventGroup> EventGroups = new Dictionary<string,ScheduledEventGroup>();
+        private static readonly Dictionary<string, ScheduledEventGroup> EventGroups = new Dictionary<string,ScheduledEventGroup>();
 
         static Scheduler()
         {
             CrestronConsole.AddNewConsoleCommand(ClearEventsFromGroup, "ClearAllEvents", "Clears all scheduled events for this group", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(ListAllEventGroups, "ListAllEventGroups", "Lists all the event groups by key", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(ListAllEventsForGroup, "ListEventsForGroup",
+                "Lists all events for the given group", ConsoleAccessLevelEnum.AccessOperator);
+
         }
 
         /// <summary>
@@ -29,12 +36,26 @@ namespace PepperDash.Essentials.Core
         /// <param name="groupName"></param>
         static void ClearEventsFromGroup(string groupName)
         {
+            if (!EventGroups.ContainsKey(groupName))
+            {
+                Debug.Console(0,
+                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
+                    groupName);
+                return;
+            }
+
             var group = EventGroups[groupName];
 
             if (group != null)
+            {
                 group.ClearAllEvents();
+
+                Debug.Console(0, "[Scheduler]: All events deleted from group '{0}'", groupName);
+            }
             else
-                Debug.Console(0, "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.", groupName);
+                Debug.Console(0,
+                    "[Scheduler]: Unable to delete events from group '{0}'.  Group not found in EventGroups dictionary.",
+                    groupName);
         }
 
         static void ListAllEventGroups(string command)
@@ -46,10 +67,36 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        static void ListAllEventsForGroup(string args)
+        {
+            Debug.Console(0, "Getting events for group {0}...", args);
+
+            ScheduledEventGroup group;
+
+            if (!EventGroups.TryGetValue(args, out group))
+            {
+                Debug.Console(0, "Unabled to get event group for key {0}", args);
+                return;
+            }
+
+            foreach (var evt in group.ScheduledEvents)
+            {
+                Debug.Console(0,
+                    @"
+****Event key {0}****
+Event date/time: {1}
+Persistent: {2}
+Acknowlegable: {3}
+Recurrence: {4}
+Recurrence Days: {5}
+********************", evt.Key, evt.Value.DateAndTime, evt.Value.Persistent, evt.Value.Acknowledgeable,
+                    evt.Value.Recurrence.Recurrence, evt.Value.Recurrence.RecurrenceDays);
+            }
+        }
+
         /// <summary>
         /// Adds the event group to the global list
         /// </summary>
-        /// <param name="name"></param>
         /// <returns></returns>
         public static void AddEventGroup(ScheduledEventGroup eventGroup)
         {
@@ -67,6 +114,13 @@ namespace PepperDash.Essentials.Core
             if(!EventGroups.ContainsKey(eventGroup.Name))
                 EventGroups.Remove(eventGroup.Name);
         }
+
+        public static ScheduledEventGroup GetEventGroup(string key)
+        {
+            ScheduledEventGroup returnValue;
+
+            return EventGroups.TryGetValue(key, out returnValue) ? returnValue : null;
+        }
     }
 
     public static class SchedulerUtilities
@@ -135,5 +189,90 @@ namespace PepperDash.Essentials.Core
 
             return isMatch;
         }
+
+        public static bool CheckEventTimeForMatch(ScheduledEvent evnt, DateTime time)
+        {
+            return evnt.DateAndTime.Hour == time.Hour && evnt.DateAndTime.Minute == time.Minute;
+        }
+
+        public static bool CheckEventRecurrenceForMatch(ScheduledEvent evnt, ScheduledEventCommon.eWeekDays days)
+        {
+            return evnt.Recurrence.RecurrenceDays == days;
+        }
+
+        public static void CreateEventFromConfig(ScheduledEventConfig config, ScheduledEventGroup group, ScheduledEvent.UserEventCallBack handler)
+        {
+            if (group == null)
+            {
+                Debug.Console(0, "Unable to create event. Group is null");
+                return;
+            }
+            var scheduledEvent = new ScheduledEvent(config.Key, group)
+            {
+                Acknowledgeable = config.Acknowledgeable,
+                Persistent = config.Persistent
+            };
+
+            scheduledEvent.UserCallBack += handler;
+
+            scheduledEvent.DateAndTime.SetFirstDayOfWeek(ScheduledEventCommon.eFirstDayOfWeek.Sunday);
+
+            var eventTime = DateTime.Parse(config.Time);
+
+            if (DateTime.Now > eventTime)
+            {
+                eventTime = eventTime.AddDays(1);
+            }
+
+            Debug.Console(2, "[Scheduler] Current Date day of week: {0} recurrence days: {1}", eventTime.DayOfWeek,
+                config.Days);
+
+            var dayOfWeekConverted = ConvertDayOfWeek(eventTime);
+
+            Debug.Console(1, "[Scheduler] eventTime Day: {0}", dayOfWeekConverted);
+
+            while (!dayOfWeekConverted.IsFlagSet(config.Days))
+            {
+                eventTime = eventTime.AddDays(1);
+
+                dayOfWeekConverted = ConvertDayOfWeek(eventTime);
+            }
+
+            scheduledEvent.DateAndTime.SetAbsoluteEventTime(eventTime);
+
+            scheduledEvent.Recurrence.Weekly(config.Days);
+
+            if (config.Enable)
+            {
+                scheduledEvent.Enable();
+            }
+            else
+            {
+                scheduledEvent.Disable();
+            }
+        }
+
+        private static ScheduledEventCommon.eWeekDays ConvertDayOfWeek(DateTime eventTime)
+        {
+            return (ScheduledEventCommon.eWeekDays) Enum.Parse(typeof(ScheduledEventCommon.eWeekDays), eventTime.DayOfWeek.ToString(), true);
+        }
+
+        private static bool IsFlagSet<T>(this T value, T flag) where T : struct
+        {
+            CheckIsEnum<T>(true);
+
+            var lValue = Convert.ToInt64(value);
+            var lFlag = Convert.ToInt64(flag);
+
+            return (lValue & lFlag) != 0;
+        }
+
+        private static void CheckIsEnum<T>(bool withFlags)
+        {
+            if (!typeof(T).IsEnum)
+                throw new ArgumentException(string.Format("Type '{0}' is not an enum", typeof(T).FullName));
+            if (withFlags && !Attribute.IsDefined(typeof(T), typeof(FlagsAttribute)))
+                throw new ArgumentException(string.Format("Type '{0}' doesn't have the 'Flags' attribute", typeof(T).FullName));
+        }
     }
 }

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

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStrings : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string
+		/// </summary>
+		void SendToLog(IKeyed device, string logMessage);
+	}
+}

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

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStringsWithLevel : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string with an int level
+		/// </summary>
+		void SendToLog(IKeyed device, Debug.ErrorLogLevel level,string logMessage);
+	}
+
+}

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;
+            }
         }
 
     }
@@ -216,7 +233,10 @@ namespace PepperDash.Essentials.Core
             }
 
 
-            PrintJoinMapInfo();
+            if (Debug.Level > 0)
+            {
+                PrintJoinMapInfo();
+            }
         }
 
         /// <summary>
@@ -266,7 +286,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 +308,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 +347,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 +363,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 +417,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 +431,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 +447,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 +481,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/Lighting/LightingBase.cs

@@ -1,83 +1,83 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Newtonsoft.Json;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Bridges;
-
-namespace PepperDash.Essentials.Core.Lighting
-{
-    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
-    {
-        #region ILightingScenes Members
-
-        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
-
-        public List<LightingScene> LightingScenes { get; protected set; }
-
-        public LightingScene CurrentLightingScene { get; protected set; }
-		
-		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
-
-        #endregion
-
-        protected LightingBase(string key, string name)
-            : base(key, name)
-        {
-            LightingScenes = new List<LightingScene>();
-
-            CurrentLightingScene = new LightingScene();
-			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
-        }
-
-        public abstract void SelectScene(LightingScene scene);
-
-        public void SimulateSceneSelect(string sceneName)
-        {
-            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
-
-            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
-
-            if (scene != null)
-            {
-                CurrentLightingScene = scene;
-                OnLightingSceneChange();
-            }
-        }
-
-        /// <summary>
-        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
-        /// </summary>
-        protected void OnLightingSceneChange()
-        {
-            foreach (var scene in LightingScenes)
-            {
-                if (scene == CurrentLightingScene)
-                    scene.IsActive = true;
-					
-                else
-                    scene.IsActive = false;
-            }
-
-            var handler = LightingSceneChange;
-            if (handler != null)
-            {
-                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
-            }
-        }
-
-        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
-            string joinMapKey, EiscApiAdvanced bridge)
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.Core.Lighting
+{
+    public abstract class LightingBase : EssentialsBridgeableDevice, ILightingScenes
+    {
+        #region ILightingScenes Members
+
+        public event EventHandler<LightingSceneChangeEventArgs> LightingSceneChange;
+
+        public List<LightingScene> LightingScenes { get; protected set; }
+
+        public LightingScene CurrentLightingScene { get; protected set; }
+		
+		public IntFeedback CurrentLightingSceneFeedback { get; protected set; }
+
+        #endregion
+
+        protected LightingBase(string key, string name)
+            : base(key, name)
         {
-            var joinMap = new GenericLightingJoinMap(joinStart);
-
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-            if (!string.IsNullOrEmpty(joinMapSerialized))
+            LightingScenes = new List<LightingScene>();
+
+            CurrentLightingScene = new LightingScene();
+			//CurrentLightingSceneFeedback = new IntFeedback(() => { return int.Parse(this.CurrentLightingScene.ID); });
+        }
+
+        public abstract void SelectScene(LightingScene scene);
+
+        public void SimulateSceneSelect(string sceneName)
+        {
+            Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
+
+            var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
+
+            if (scene != null)
+            {
+                CurrentLightingScene = scene;
+                OnLightingSceneChange();
+            }
+        }
+
+        /// <summary>
+        /// Sets the IsActive property on each scene and fires the LightingSceneChange event
+        /// </summary>
+        protected void OnLightingSceneChange()
+        {
+            foreach (var scene in LightingScenes)
+            {
+                if (scene == CurrentLightingScene)
+                    scene.IsActive = true;
+					
+                else
+                    scene.IsActive = false;
+            }
+
+            var handler = LightingSceneChange;
+            if (handler != null)
+            {
+                handler(this, new LightingSceneChangeEventArgs(CurrentLightingScene));
+            }
+        }
+
+        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
+            string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new GenericLightingJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
 
             if (bridge != null)
@@ -87,52 +87,62 @@ namespace PepperDash.Essentials.Core.Lighting
             else
             {
                 Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
-
-            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
-
+            }
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+
             // GenericLighitng Actions & FeedBack
-            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
-
-            var sceneIndex = 0;
-            foreach (var scene in lightingDevice.LightingScenes)
+            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+            var sceneIndex = 0;
+            foreach (var scene in lightingDevice.LightingScenes)
             {
-                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[sceneIndex]));
+                var index1 = sceneIndex;
+                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () =>
+                {
+                    var index = index1;
+                    Debug.Console(2, this, "LightingDevice: sceneIndex: {0} index: {1} > inside action", index1, index);
+                    lightingDevice.SelectScene(lightingDevice.LightingScenes[index]);
+                });
                 scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)]);
-                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
-                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
-                sceneIndex++;
-            }
-
-            return joinMap;
-        }
-
-    }
-
-    public class LightingScene
-    {
-        public string Name { get; set; }
-        public string ID { get; set; }
-        bool _IsActive;
-        public bool IsActive 
-        {
-            get
-            {
-                return _IsActive;
-            }
-            set
-            {
-                _IsActive = value;
-                IsActiveFeedback.FireUpdate();
-            }
-        }
-        public BoolFeedback IsActiveFeedback { get; set; }
-
-        public LightingScene()
-        {
-            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
-        }
-    }
+                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
+                sceneIndex++;
+            }
+            return joinMap;
+        }
+
+    }
+
+    public class LightingScene
+    {
+        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+        public string Name { get; set; }
+        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+        public string ID { get; set; }
+        bool _IsActive;
+        [JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
+        public bool IsActive 
+        {
+            get
+            {
+                return _IsActive;
+            }
+            set
+            {
+                _IsActive = value;
+                IsActiveFeedback.FireUpdate();
+            }
+        }
+
+        [JsonIgnore]
+        public BoolFeedback IsActiveFeedback { get; set; }
+
+        public LightingScene()
+        {
+            IsActiveFeedback = new BoolFeedback(new Func<bool>(() => IsActive));
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs

@@ -88,11 +88,6 @@ namespace PepperDash.Essentials.Core.Privacy
             else
                 Debug.Console(0, this, "Unable to add Red LED device");
 
-            DeviceManager.AllDevicesActivated += (o, a) =>
-                {
-                    CheckPrivacyMode();
-                };
-
             AddPostActivationAction(() => {
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange -= PrivacyModeIsOnFeedback_OutputChange;
                 PrivacyDevice.PrivacyModeIsOnFeedback.OutputChange += PrivacyModeIsOnFeedback_OutputChange;
@@ -103,6 +98,15 @@ namespace PepperDash.Essentials.Core.Privacy
             return base.CustomActivate();
         }
 
+        #region Overrides of Device
+
+        public override void Initialize()
+        {
+            CheckPrivacyMode();
+        }
+
+        #endregion
+
         public void SetPrivacyDevice(IPrivacy privacyDevice)
         {
             PrivacyDevice = privacyDevice;

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

@@ -1,460 +1,539 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 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 abstract class GlsOccupancySensorBaseController : CrestronGenericBridgeableBaseDevice, IOccupancyStatusProvider
+	{
+        public GlsOccupancySensorPropertiesConfig PropertiesConfig { get; private set; }
 
-        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+	    protected GlsOccupancySensorBase OccSensor;
 
-        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
+		public bool TestRoomIsOccupiedFeedback { get; private set; }
+
+		public Func<bool> RoomIsOccupiedFeedbackFunc
+		{
+			get
+			{
+				return () => InTestMode ? TestRoomIsOccupiedFeedback : OccSensor.OccupancyDetectedFeedback.BoolValue;
+			}
+		}
+
+	    protected GlsOccupancySensorBaseController(string key, DeviceConfig config)
+			: this(key, config.Name, config)
+		{
+		}
+
+	    protected GlsOccupancySensorBaseController(string key, string name, DeviceConfig config)
+            : base(key, name) 
         {
-            get
+
+            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"));
-
-            #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)
+            AddPostActivationAction(() =>
                 {
-                    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = occController.Name;
-                }
-            };
+                    OccSensor.OnlineStatusChange += (o, a) =>
+                    {
+                        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);
+                    if (OccSensor.IsOnline)
+                    {
+                        ApplySettingsToSensorFromConfig();
 
-            // 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)
+
+        /// <summary>
+        /// Applies any sensor settings defined in config 
+        /// </summary>
+        protected virtual void ApplySettingsToSensorFromConfig()
         {
-            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+            Debug.Console(1, this, "Attempting to apply settings to sensor from config");
+
+            if (PropertiesConfig.EnablePir != null)
+            {
+                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");
+            }
+
+            if (PropertiesConfig.EnableLedFlash != null)
+            {
+                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);
+            }
         }
 
-        #region PreActivation
+		protected void RegisterGlsOccupancySensorBaseController(GlsOccupancySensorBase occSensor)
+		{
+			OccSensor = occSensor;
 
-        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;
+			RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
 
-            if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
+			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 GlsOccupancySensorBase.RoomVacantFeedbackEventId:
+				case 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);
+
+	        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)
+	    {
+	        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)
+	    {
+	        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;
+		}
+
+        /// <summary>
+        /// Pulse ForceOccupied on the sensor for .5 seconds
+        /// </summary>
+	    public void ForceOccupied()
+	    {
+	        CrestronInvoke.BeginInvoke((o) =>
+	        {
+	            ForceOccupied(true);
+	            CrestronEnvironment.Sleep(500);
+	            ForceOccupied(false);
+	        });
+	    }
+
+		public void ForceOccupied(bool value)
+		{
+			OccSensor.ForceOccupied.BoolValue = value;
+		}
+
+        /// <summary>
+        /// Pulse ForceVacant on the sensor for .5 seconds
+        /// </summary>
+	    public void ForceVacant()
+	    {
+            CrestronInvoke.BeginInvoke((o) =>
             {
-                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;
+                ForceVacant(true);
+                CrestronEnvironment.Sleep(500);
+                ForceVacant(false);
+            });
+	    }
 
-            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 void ForceVacant(bool value)
+		{
+			OccSensor.ForceVacant.BoolValue = value;
+		}
 
-        public class GlsOccupancySensorBaseControllerFactory : EssentialsDeviceFactory<GlsOccupancySensorBaseController>
-        {
-            public GlsOccupancySensorBaseControllerFactory()
-            {
-                TypeNames = new List<string>() { "glsoirccn" };
-            }
+		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>
+	    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"));
+
+			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;
+				}
+			};
+
+			LinkSingleTechSensorToApi(occController, trilist, joinMap);
+
+			LinkDualTechSensorToApi(occController, trilist, joinMap);
+		}
+
+	    private static void LinkDualTechSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
+	        GlsOccupancySensorBaseJoinMap joinMap)
+	    {
+	        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.UltrasonicBEnabledFeedback.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]);
+	    }
+
+	    private static void LinkSingleTechSensorToApi(GlsOccupancySensorBaseController occController, BasicTriList trilist,
+	        GlsOccupancySensorBaseJoinMap joinMap)
+	    {
+// Occupied status
+	        trilist.SetBoolSigAction(joinMap.ForceOccupied.JoinNumber, occController.ForceOccupied);
+	        trilist.SetBoolSigAction(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]);
+	    }
+	}
 
 
-            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,81 @@
+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; }
+
+        // PoE Sensors: CenOdtCPoe
+
+        /// <summary>
+        /// Sets the sensitivity level for US while sensor is in occupied state
+        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
+        /// </summary>
+        [JsonProperty("usSensitivityOccupied")]
+        public ushort? UsSensitivityOccupied { get; set; }
+
+        /// <summary>
+        /// Sets the sensitivity level for US while sensor is in vacant state
+        /// 1 = low; 2 = medium; 3 = high; 4 = xlow; 5 = 2xlow; 6 = 3xlow
+        /// </summary>
+        [JsonProperty("usSensitivityVacant")]
+        public ushort? UsSensitivityVacant { get; set; }
+
+        /// <summary>
+        /// Sets the sensitivity level for PIR while sensor is in occupied state
+        /// 1 = low; 2 = medium; 3 = high
+        /// </summary>
+        [JsonProperty("pirSensitivityOccupied")]
+        public ushort? PirSensitivityOccupied { get; set; }
+
+        /// <summary>
+        /// Sets the sensitivity level for PIR while sensor is in vacant state
+        /// 1 = low; 2 = medium; 3 = high
+        /// </summary>
+        [JsonProperty("pirSensitivityVacant")]
+        public ushort? PirSensitivityVacant { get; set; }
+    }
+}

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

@@ -1,183 +1,266 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 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; }
+	{
+	    private GlsOdtCCn _occSensor;
 
-        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);
+
+				RegisterGlsOccupancySensorBaseController(_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);
+                Debug.Console(1, this, "EnableUsA found, attempting to set value from config");
+                SetUsAEnable((bool)PropertiesConfig.EnableUsA);   
+            }
+            else
+            {
+                Debug.Console(1, this, "EnableUsA null, no value specified in config");
+            }
 
-                RegisterCrestronGenericBase(OccSensor);
 
-                RegisterGlsOdtSensorBaseController(OccSensor);
+            if (PropertiesConfig.EnableUsB != null)
+            {
+                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");
+            }
 
-                AndWhenVacatedFeedback = new BoolFeedback(() => OccSensor.AndWhenVacatedFeedback.BoolValue);
 
-                OrWhenVacatedFeedback = new BoolFeedback(() => OccSensor.OrWhenVacatedFeedback.BoolValue);
+            if (PropertiesConfig.OrWhenVacatedState != null)
+            {
+                SetOrWhenVacatedState((bool)PropertiesConfig.OrWhenVacatedState);
+            }
 
-                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);
-
-            });       
+            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)
+		/// <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)
+		{
+		    switch (args.EventId)
+		    {
+		        case GlsOccupancySensorBase.AndWhenVacatedFeedbackEventId:
+		            AndWhenVacatedFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.OrWhenVacatedFeedbackEventId:
+		            OrWhenVacatedFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.UsAEnabledFeedbackEventId:
+		            UltrasonicAEnabledFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.UsBEnabledFeedbackEventId:
+		            UltrasonicBEnabledFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.UsSensitivityInOccupiedStateFeedbackEventId:
+		            UltrasonicSensitivityInOccupiedStateFeedback.FireUpdate();
+		            break;
+		        case GlsOccupancySensorBase.UsSensitivityInVacantStateFeedbackEventId:
+		            UltrasonicSensitivityInVacantStateFeedback.FireUpdate();
+		            break;
+		    }
+
+		    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)
+	    {
+	        switch (args.EventId)
+	        {
+	            case GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId:
+	                RawOccupancyPirFeedback.FireUpdate();
+	                break;
+	            case GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId:
+	                RawOccupancyUsFeedback.FireUpdate();
+	                break;
+	        }
+
+	        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));
+		}
+
+	}
+
+    public class GlsOdtOccupancySensorControllerFactory : EssentialsDeviceFactory<GlsOdtOccupancySensorController>
+    {
+        public GlsOdtOccupancySensorControllerFactory()
         {
-            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);
+            TypeNames = new List<string> { "glsodtccn" };
         }
 
-        /// <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)
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-             if (args.EventId == GlsOccupancySensorBase.RawOccupancyPirFeedbackEventId)
-                RawOccupancyPirFeedback.FireUpdate();
-            else if (args.EventId == GlsOccupancySensorBase.RawOccupancyUsFeedbackEventId)
-                RawOccupancyUsFeedback.FireUpdate();
+            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
 
-            base.OccSensor_BaseEvent(device, args);
+            return new GlsOdtOccupancySensorController(dc.Key, GetGlsOdtCCn, dc);
         }
 
-        /// <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;
+            var parentKey = String.IsNullOrEmpty(control.ControlPortDevKey) ? "processor" : control.ControlPortDevKey;
 
             if (parentKey.Equals("processor", StringComparison.CurrentCultureIgnoreCase))
             {
@@ -194,24 +277,6 @@ namespace PepperDash.Essentials.Core
             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/Occupancy/GlsOirOccupancySensorController.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.GeneralIO;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+    public class GlsOirOccupancySensorController:GlsOccupancySensorBaseController
+    {
+        private GlsOirCCn _occSensor;
+
+        public GlsOirOccupancySensorController(string key, Func<DeviceConfig, GlsOirCCn> preActivationFunc,DeviceConfig config) : this(key,config.Name, preActivationFunc, config)
+        {
+        }
+
+        public GlsOirOccupancySensorController(string key, string name, Func<DeviceConfig, GlsOirCCn> preActivationFunc, DeviceConfig config) : base(key, name, config)
+        {
+            AddPreActivationAction(() =>
+            {
+                _occSensor = preActivationFunc(config);
+
+                RegisterCrestronGenericBase(_occSensor);
+
+                RegisterGlsOccupancySensorBaseController(_occSensor);
+            });
+        }
+
+        #region Overrides of CrestronGenericBridgeableBaseDevice
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            LinkOccSensorToApi(this, trilist, joinStart, joinMapKey, bridge);
+        }
+
+        #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 GlsOirOccupancySensorController Device");
+
+            return new GlsOirOccupancySensorController(dc.Key, GetGlsOirCCn, dc);
+        }
+
+        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;
+        }
+
+    }
+}

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

@@ -2,17 +2,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.GeneralIO;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core
 {
     /// <summary>
     /// Aggregates the RoomIsOccupied feedbacks of one or more IOccupancyStatusProvider objects
     /// </summary>
-    public class IOccupancyStatusProviderAggregator : Device, IOccupancyStatusProvider
+    public class IOccupancyStatusProviderAggregator : EssentialsDevice, IOccupancyStatusProvider
     {
         /// <summary>
         /// Aggregated feedback of all linked IOccupancyStatusProvider devices
@@ -21,16 +22,51 @@ namespace PepperDash.Essentials.Core
         {
             get
             {
-                return AggregatedOccupancyStatus.Output;
+                return _aggregatedOccupancyStatus.Output;
             }
         }
 
-        private BoolFeedbackOr AggregatedOccupancyStatus;
+        private readonly BoolFeedbackOr _aggregatedOccupancyStatus;
 
         public IOccupancyStatusProviderAggregator(string key, string name) 
             : base(key, name)
         {
-            AggregatedOccupancyStatus = new BoolFeedbackOr();
+            _aggregatedOccupancyStatus = new BoolFeedbackOr();
+        }
+
+        public IOccupancyStatusProviderAggregator(string key, string name, OccupancyAggregatorConfig config)
+            : this(key, name)
+        {
+            AddPostActivationAction(() =>
+            {
+                if (config.DeviceKeys.Count == 0)
+                {
+                    return;
+                }
+
+                foreach (var deviceKey in config.DeviceKeys)
+                {
+                    var device = DeviceManager.GetDeviceForKey(deviceKey);
+
+                    if (device == null)
+                    {
+                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                            "Unable to retrieve Occupancy provider with key {0}", deviceKey);
+                        continue;
+                    }
+
+                    var provider = device as IOccupancyStatusProvider;
+
+                    if (provider == null)
+                    {
+                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                            "Device with key {0} does NOT implement IOccupancyStatusProvider. Please check configuration.");
+                        continue;
+                    }
+
+                    AddOccupancyStatusProvider(provider);
+                }
+            });
         }
 
         /// <summary>
@@ -39,7 +75,35 @@ namespace PepperDash.Essentials.Core
         /// <param name="statusProvider"></param>
         public void AddOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
         {
-            AggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
+            _aggregatedOccupancyStatus.AddOutputIn(statusProvider.RoomIsOccupiedFeedback);
+        }
+
+        public void RemoveOccupancyStatusProvider(IOccupancyStatusProvider statusProvider)
+        {
+            _aggregatedOccupancyStatus.RemoveOutputIn(statusProvider.RoomIsOccupiedFeedback);
+        }
+
+        public void ClearOccupancyStatusProviders()
+        {
+            _aggregatedOccupancyStatus.ClearOutputs();
         }
+    }
+
+    public class OccupancyAggregatorFactory : EssentialsDeviceFactory<IOccupancyStatusProviderAggregator>
+    {
+        public OccupancyAggregatorFactory()
+        {
+            TypeNames = new List<string> { "occupancyAggregator", "occAggregate" };
+        }
+
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new GlsOccupancySensorBaseController Device");
+
+            var config = dc.Properties.ToObject<OccupancyAggregatorConfig>();
+                
+            return new IOccupancyStatusProviderAggregator(dc.Key, dc.Name, config);
+        }
     }
 }

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

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core
+{
+    public class OccupancyAggregatorConfig
+    {
+        [JsonProperty("deviceKeys")] public List<string> DeviceKeys { get; set; }
+
+        public OccupancyAggregatorConfig()
+        {
+            DeviceKeys = new List<string>();
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/EssentialsPartitionController.cs

@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Represents an abstract controller device for a partition dividing rooms that are combinable
+    /// 
+    /// In Auto mode, it can use a partition sensor to automatically determine whether the partition is present.
+    /// 
+    /// In Manual mode it accepts user input to tell it whether the partition is present.
+    /// </summary>
+    public class EssentialsPartitionController : IPartitionController
+    {
+        private IPartitionStateProvider _partitionSensor;
+
+        private bool isInAutoMode;
+
+        private bool partitionPresent;
+
+        public EssentialsPartitionController(string key, string name, IPartitionStateProvider sensor, bool defaultToManualMode, List<string> adjacentRoomKeys)
+        {
+            Key = key;
+
+            Name = name;
+
+            AdjacentRoomKeys = adjacentRoomKeys;
+
+            if (sensor != null)
+            {
+                _partitionSensor = sensor;
+
+                if (!defaultToManualMode)
+                {
+                    SetAutoMode();
+                }
+                else
+                {
+                    SetManualMode();
+                }
+            }
+            else
+            {
+                SetManualMode();
+            }
+
+            PartitionPresentFeedback.FireUpdate();
+        }
+
+        void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            if (isInAutoMode)
+            {
+                PartitionPresentFeedback.FireUpdate();
+            }
+        }
+
+        #region IPartitionController Members
+
+        public List<string> AdjacentRoomKeys { get; private set; }
+
+        public void SetAutoMode()
+        {
+            isInAutoMode = true;
+            if (PartitionPresentFeedback != null)
+            {
+                PartitionPresentFeedback.SetValueFunc(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
+            }
+            else
+            {
+                PartitionPresentFeedback = new BoolFeedback(() => _partitionSensor.PartitionPresentFeedback.BoolValue);
+            }
+
+            if (_partitionSensor != null)
+            {
+                _partitionSensor.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
+            }
+        }
+
+        public void SetManualMode()
+        {
+            isInAutoMode = false;
+            if (PartitionPresentFeedback != null)
+            {
+                PartitionPresentFeedback.SetValueFunc(() => partitionPresent);
+            }
+            else
+            {
+                PartitionPresentFeedback = new BoolFeedback(() => partitionPresent);
+            }
+
+            if (_partitionSensor != null)
+            {
+                _partitionSensor.PartitionPresentFeedback.OutputChange -= PartitionPresentFeedback_OutputChange;
+            }
+        }
+
+
+        public void SetPartitionStatePresent()
+        {
+            if (!isInAutoMode)
+            {
+                partitionPresent = true;
+                PartitionPresentFeedback.FireUpdate();
+            }
+        }
+
+        public void SetPartitionStateNotPresent()
+        {
+            if (!isInAutoMode)
+            {
+                partitionPresent = false;
+                PartitionPresentFeedback.FireUpdate();
+            }
+        }
+
+        public void ToggglePartitionState()
+        {
+            if (!isInAutoMode)
+            {
+                partitionPresent = !partitionPresent;
+                PartitionPresentFeedback.FireUpdate();
+            }
+        }
+
+        #endregion
+
+        #region IPartitionStateProvider Members
+
+        public BoolFeedback PartitionPresentFeedback { get; private set; }
+
+        #endregion
+
+        #region IKeyName Members
+
+        public string Name { get; private set; }
+
+        #endregion
+
+        #region IKeyed Members
+
+        public string Key { get; private set; }
+
+        #endregion
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorController.cs

@@ -1,25 +1,29 @@
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.GeneralIO;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Bridges;
-using PepperDash_Essentials_Core.Bridges.JoinMaps;
+using PepperDash.Essentials.Core.Bridges.JoinMaps;
 
 using System;
 using System.Collections.Generic;
 using PepperDash.Essentials.Core.Config;
+using PepperDash_Essentials_Core.PartitionSensor;
 
 namespace PepperDash.Essentials.Core
 {
 	[Description("Wrapper class for GLS Cresnet Partition Sensor")]
-	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice
+	public class GlsPartitionSensorController : CrestronGenericBridgeableBaseDevice, IPartitionStateProvider
 	{
-		private GlsPartCn _partitionSensor;
 
-		public StringFeedback NameFeedback { get; private set; }
+        public GlsPartitionSensorPropertiesConfig PropertiesConfig { get; private set; }
+        
+        private GlsPartCn _partitionSensor;
+
 		public BoolFeedback EnableFeedback { get; private set; }
-		public BoolFeedback PartitionSensedFeedback { get; private set; }
+		public BoolFeedback PartitionPresentFeedback { get; private set; }
 		public BoolFeedback PartitionNotSensedFeedback { get; private set; }
 		public IntFeedback SensitivityFeedback { get; private set; }
 
@@ -32,23 +36,71 @@ namespace PepperDash.Essentials.Core
 		public GlsPartitionSensorController(string key, Func<DeviceConfig, GlsPartCn> preActivationFunc, DeviceConfig config)
 			: base(key, config.Name)
 		{
+
+		    var props = config.Properties.ToObject<GlsPartitionSensorPropertiesConfig>();
+		    if (props != null)
+		    {
+		        PropertiesConfig = props;
+		    }
+		    else
+		    {
+		        Debug.Console(1, this, "props are null.  Unable to deserialize into GlsPartSensorPropertiesConfig");
+		    }
+
             AddPreActivationAction(() =>
             {
                 _partitionSensor = preActivationFunc(config);
-
+                
                 RegisterCrestronGenericBase(_partitionSensor);
+                                
+                EnableFeedback = new BoolFeedback(() => InTestMode ? TestEnableFeedback : _partitionSensor.EnableFeedback.BoolValue);
+                PartitionPresentFeedback = new BoolFeedback(() => InTestMode ? TestPartitionSensedFeedback : _partitionSensor.PartitionSensedFeedback.BoolValue);
+                PartitionNotSensedFeedback = new BoolFeedback(() => InTestMode ? !TestPartitionSensedFeedback : _partitionSensor.PartitionNotSensedFeedback.BoolValue);
+                SensitivityFeedback = new IntFeedback(() => InTestMode ? TestSensitivityFeedback : _partitionSensor.SensitivityFeedback.UShortValue);
 
-                NameFeedback = new StringFeedback(() => Name);
-                EnableFeedback = new BoolFeedback(() => _partitionSensor.EnableFeedback.BoolValue);
-                PartitionSensedFeedback = new BoolFeedback(() => _partitionSensor.PartitionSensedFeedback.BoolValue);
-                PartitionNotSensedFeedback = new BoolFeedback(() => _partitionSensor.PartitionNotSensedFeedback.BoolValue);
-                SensitivityFeedback = new IntFeedback(() => _partitionSensor.SensitivityFeedback.UShortValue);
-
-                if (_partitionSensor != null) _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;
+                if (_partitionSensor != null)
+                {
+                    _partitionSensor.BaseEvent += PartitionSensor_BaseEvent;                    
+                }
             });
-		}
 
-		private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
+            AddPostActivationAction(() =>
+            {
+                _partitionSensor.OnlineStatusChange += (o, a) =>
+                {
+                    if (a.DeviceOnLine)
+                    {
+                        ApplySettingsToSensorFromConfig();
+                    }
+                };
+
+                if (_partitionSensor.IsOnline)
+                {
+                    ApplySettingsToSensorFromConfig();
+                }
+            });
+		}        
+
+	    private void ApplySettingsToSensorFromConfig()
+	    {
+	        if (_partitionSensor.IsOnline == false) return;
+
+	        Debug.Console(1, this, "Attempting to apply settings to sensor from config");            
+
+	        if (PropertiesConfig.Sensitivity != null)
+	        {
+	            Debug.Console(1, this, "Sensitivity found, attempting to set value '{0}' from config",
+	                PropertiesConfig.Sensitivity);
+                _partitionSensor.Sensitivity.UShortValue = (ushort) PropertiesConfig.Sensitivity;
+	        }	        
+	        else
+	        {
+	            Debug.Console(1, this, "Sensitivity null, no value specified in config");
+	        }
+
+	    }
+
+	    private void PartitionSensor_BaseEvent(GenericBase device, BaseEventArgs args)
 		{
 			Debug.Console(2, this, "EventId: {0}, Index: {1}", args.EventId, args.Index);
 
@@ -61,11 +113,13 @@ namespace PepperDash.Essentials.Core
 					}
 				case (GlsPartCn.PartitionSensedFeedbackEventId):
 					{
-						PartitionSensedFeedback.FireUpdate();
+                        Debug.Console(1, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
+						PartitionPresentFeedback.FireUpdate();
 						break;
 					}
 				case (GlsPartCn.PartitionNotSensedFeedbackEventId):
 					{
+                        Debug.Console(1, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
 						PartitionNotSensedFeedback.FireUpdate();
 						break;
 					}
@@ -73,7 +127,7 @@ namespace PepperDash.Essentials.Core
 					{
 						SensitivityFeedback.FireUpdate();
 						break;
-					}
+					}                    
 				default:
 					{
 						Debug.Console(2, this, "Unhandled args.EventId: {0}", args.EventId);
@@ -93,6 +147,9 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestEnableFeedback = state;
+
+			    EnableFeedback.FireUpdate();
+
 				Debug.Console(1, this, "TestEnableFeedback: {0}", TestEnableFeedback.ToString());
 				return;
 			}
@@ -105,6 +162,10 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestPartitionSensedFeedback = state;
+
+                PartitionPresentFeedback.FireUpdate();
+                PartitionNotSensedFeedback.FireUpdate();
+
 				Debug.Console(1, this, "TestPartitionSensedFeedback: {0}", TestPartitionSensedFeedback.ToString());
 				return;
 			}
@@ -117,6 +178,8 @@ namespace PepperDash.Essentials.Core
 			if (InTestMode)
 			{
 				TestSensitivityFeedback = value;
+
+                SensitivityFeedback.FireUpdate();
 				Debug.Console(1, this, "TestSensitivityFeedback: {0}", TestSensitivityFeedback);
 				return;
 			}
@@ -124,8 +187,24 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "InTestMode: {0}, unable to set sensitivity value: {1}", InTestMode.ToString(), value);
 		}
 
-		public void SetEnableState(bool state)
+	    public void GetSettings()
+	    {
+	        var dash = new string('*', 50);
+	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+
+	        Debug.Console(0, this, "Enabled State: {0}", _partitionSensor.EnableFeedback.BoolValue);
+
+	        Debug.Console(0, this, "Partition Sensed State: {0}", _partitionSensor.PartitionSensedFeedback.BoolValue);
+	        Debug.Console(0, this, "Partition Not Sensed State: {0}", _partitionSensor.PartitionNotSensedFeedback.BoolValue);
+
+	        Debug.Console(0, this, "Sensitivity Value: {0}", _partitionSensor.SensitivityFeedback.UShortValue);
+
+	        CrestronConsole.PrintLine(string.Format("{0}\n", dash));
+	    }
+
+	    public void SetEnableState(bool state)
 		{
+            Debug.Console(2, this, "Sensor is {0}, SetEnableState: {1}", _partitionSensor == null ? "null" : "not null", state);
 			if (_partitionSensor == null)
 				return;
 
@@ -134,6 +213,7 @@ namespace PepperDash.Essentials.Core
 
 		public void IncreaseSensitivity()
 		{
+            Debug.Console(2, this, "Sensor is {0}, IncreaseSensitivity", _partitionSensor == null ? "null" : "not null");
 			if (_partitionSensor == null)
 				return;
 
@@ -142,6 +222,7 @@ namespace PepperDash.Essentials.Core
 
 		public void DecreaseSensitivity()
 		{
+            Debug.Console(2, this, "Sensor is {0}, DecreaseSensitivity", _partitionSensor == null ? "null" : "not null");
 			if (_partitionSensor == null)
 				return;
 
@@ -150,6 +231,7 @@ namespace PepperDash.Essentials.Core
 
 		public void SetSensitivity(ushort value)
 		{
+            Debug.Console(2, this, "Sensor is {0}, SetSensitivity: {1}", _partitionSensor == null ? "null" : "not null", value);
 			if (_partitionSensor == null)
 				return;
 
@@ -176,19 +258,20 @@ namespace PepperDash.Essentials.Core
 			Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
 			Debug.Console(0, this, "Linking to Bridge Type {0}", GetType().Name);
 
-			// link input from simpl
-			trilist.SetSigTrueAction(joinMap.Enable.JoinNumber, () => SetEnableState(true));
-			trilist.SetSigFalseAction(joinMap.Enable.JoinNumber, () => SetEnableState(false));
+            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);            
+		    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
+			
+		    trilist.SetBoolSigAction(joinMap.Enable.JoinNumber, SetEnableState);
+            EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
+
+            PartitionPresentFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
+            PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
+
 			trilist.SetSigTrueAction(joinMap.IncreaseSensitivity.JoinNumber, IncreaseSensitivity);
 			trilist.SetSigTrueAction(joinMap.DecreaseSensitivity.JoinNumber, DecreaseSensitivity);
-			trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
 
-			// link output to simpl
-			IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			EnableFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Enable.JoinNumber]);
-			PartitionSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionSensed.JoinNumber]);
-			PartitionNotSensedFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PartitionNotSensed.JoinNumber]);
-			SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
+            SensitivityFeedback.LinkInputSig(trilist.UShortInput[joinMap.Sensitivity.JoinNumber]);
+            trilist.SetUShortSigAction(joinMap.Sensitivity.JoinNumber, SetSensitivity);
 
 			FeedbacksFireUpdates();
 
@@ -206,6 +289,7 @@ namespace PepperDash.Essentials.Core
 			{
 				if (a.DeviceOnLine)
 				{
+				    trilist.StringInput[joinMap.Name.JoinNumber].StringValue = _partitionSensor.Name;
 					FeedbacksFireUpdates();
 				}
 			};
@@ -213,10 +297,9 @@ namespace PepperDash.Essentials.Core
 
 		private void FeedbacksFireUpdates()
 		{
-			IsOnline.FireUpdate();
-			NameFeedback.FireUpdate();
+			IsOnline.FireUpdate();			
 			EnableFeedback.FireUpdate();
-			PartitionSensedFeedback.FireUpdate();
+			PartitionPresentFeedback.FireUpdate();
 			PartitionNotSensedFeedback.FireUpdate();
 			SensitivityFeedback.FireUpdate();
 		}
@@ -257,7 +340,7 @@ namespace PepperDash.Essentials.Core
 
             public override EssentialsDevice BuildDevice(DeviceConfig dc)
             {
-                Debug.Console(1, "Factory Attempting to create new C2N-RTHS Device");
+                Debug.Console(1, "Factory Attempting to create new GlsPartitionSensorController Device");
 
                 return new GlsPartitionSensorController(dc.Key, GetGlsPartCnDevice, dc);
             }

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/GlsPartitionSensorPropertiesConfig.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+
+namespace PepperDash_Essentials_Core.PartitionSensor
+{
+    public class GlsPartitionSensorPropertiesConfig
+    {
+        /// <summary>
+        /// Sets the sensor sensitivity        
+        /// </summary>
+        /// <remarks>
+        /// The sensitivity range shall be between 1(lowest) to 10 (highest).
+        /// </remarks>
+        [JsonProperty("sensitivity")]
+        public ushort? Sensitivity { get; set; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/PartitionSensor/IPartitionStateProvider.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Describes the functionality of a device that senses and provides partition state
+    /// </summary>
+    public interface IPartitionStateProvider : IKeyName
+    {
+        BoolFeedback PartitionPresentFeedback { get; }
+    }
+
+    /// <summary>
+    /// Describes the functionality of a device that can provide partition state either manually via user input or optionally via a sensor state
+    /// </summary>
+    public interface IPartitionController : IPartitionStateProvider
+    {
+        List<string> AdjacentRoomKeys { get; }
+
+        void SetPartitionStatePresent();
+
+        void SetPartitionStateNotPresent();
+
+        void ToggglePartitionState();
+
+        void SetManualMode();
+
+        void SetAutoMode();
+    }
+}

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

@@ -48,39 +48,39 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
@@ -89,30 +89,30 @@
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -131,6 +131,7 @@
     <Compile Include="Bridges\JoinMaps\DmBladeChassisControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmChassisControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmpsAudioOutputControllerJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\DmpsMicrophoneControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmpsRoutingControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmRmcControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\DmTxControllerJoinMap.cs" />
@@ -143,6 +144,7 @@
     <Compile Include="Bridges\JoinMaps\Hrxxx0WirelessRemoteControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IBasicCommunicationJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalInputJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IRBlurayBaseJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
@@ -161,6 +163,7 @@
     <Compile Include="Config\Essentials\ConfigWriter.cs" />
     <Compile Include="Config\Essentials\EssentialsConfig.cs" />
     <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
+    <Compile Include="Crestron IO\C2nIo\C2nIoController.cs" />
     <Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
     <Compile Include="Crestron IO\Cards\C3CardControllerBase.cs" />
     <Compile Include="Crestron IO\Cards\C3Com3Controller.cs" />
@@ -180,6 +183,7 @@
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
     <Compile Include="Crestron IO\IOPortConfig.cs" />
+    <Compile Include="Crestron IO\Relay\CenIoRy104Controller.cs" />
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
@@ -188,6 +192,7 @@
     <Compile Include="Device Info\IDeviceInfoProvider.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
+    <Compile Include="Devices\DestinationListItem.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
     <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
@@ -195,10 +200,13 @@
     <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IDspPreset.cs" />
     <Compile Include="Devices\IProjectorInterfaces.cs" />
+    <Compile Include="Devices\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
+    <Compile Include="DeviceTypeInterfaces\ITvPresetsProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\LanguageLabel.cs" />
     <Compile Include="DeviceTypeInterfaces\ILanguageProvider.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
@@ -206,6 +214,7 @@
     <Compile Include="DeviceTypeInterfaces\IHasFarEndContentStatus.cs" />
     <Compile Include="DeviceTypeInterfaces\IHasPhoneDialing.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
+    <Compile Include="Extensions\JsonExtensions.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
     <Compile Include="Factory\ReadyEventArgs.cs" />
@@ -219,10 +228,19 @@
     <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="Occupancy\GlsOirOccupancySensorController.cs" />
+    <Compile Include="PartitionSensor\EssentialsPartitionController.cs" />
+    <Compile Include="PartitionSensor\GlsPartitionSensorPropertiesConfig.cs" />
+    <Compile Include="PartitionSensor\IPartitionStateProvider.cs" />
+    <Compile Include="Occupancy\OccupancyAggregatorConfig.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />
@@ -277,7 +295,13 @@
     <Compile Include="Remotes\CrestronRemotePropertiesConfig.cs" />
     <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
     <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Room\Combining\EssentialsRoomCombiner.cs" />
+    <Compile Include="Room\Combining\EssentialsRoomCombinerPropertiesConfig.cs" />
+    <Compile Include="Room\Combining\IEssentialsRoomCombiner.cs" />
+    <Compile Include="Room\Combining\RoomCombinationScenario.cs" />
     <Compile Include="Room\EssentialsRoomBase.cs" />
+    <Compile Include="Room\Config\EssentialsRoomScheduledEventsConfig.cs" />
+    <Compile Include="Room\IEssentialsRoom.cs" />
     <Compile Include="Room\Interfaces.cs" />
     <Compile Include="Room\iOccupancyStatusProvider.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
@@ -311,6 +335,10 @@
     <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
     <Compile Include="Routing\RoutingPortNames.cs" />
     <Compile Include="Routing\TieLineConfig.cs" />
+    <Compile Include="Secrets\CrestronSecretsProvider.cs" />
+    <Compile Include="Secrets\Interfaces.cs" />
+    <Compile Include="Secrets\SecretsManager.cs" />
+    <Compile Include="Secrets\SecretsPropertiesConfig.cs" />
     <Compile Include="Shades\Shade Interfaces.cs" />
     <Compile Include="Shades\ShadeBase.cs" />
     <Compile Include="Shades\ShadeController.cs" />
@@ -321,6 +349,7 @@
     <Compile Include="Routing\TieLine.cs" />
     <Compile Include="Queues\StringResponseProcessor.cs" />
     <Compile Include="Timers\CountdownTimer.cs" />
+    <Compile Include="Timers\RetriggerableTimer.cs" />
     <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="Touchpanels\Interfaces.cs" />
     <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
@@ -331,6 +360,7 @@
     <Compile Include="UI PageManagers\SinglePageManager.cs" />
     <Compile Include="UI PageManagers\PageManager.cs" />
     <Compile Include="UI PageManagers\SetTopBoxTwoPanelPageManager.cs" />
+    <Compile Include="Utilities\ActionSequence.cs" />
     <Compile Include="VideoStatus\VideoStatusOutputs.cs" />
     <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
     <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.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.43, 1.1.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.45, 2.0.0)"/>
     </dependencies>
   </metadata>
   <files>

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

@@ -123,7 +123,7 @@ namespace PepperDash.Essentials
         /// <param name="fileName"></param>
         static LoadedAssembly LoadAssembly(string filePath)
         {
-            Debug.Console(2, "Attempting to load {0}", filePath);
+            //Debug.Console(2, "Attempting to load {0}", filePath);
             var assembly = Assembly.LoadFrom(filePath);
             if (assembly != null)
             {
@@ -358,14 +358,27 @@ namespace PepperDash.Essentials
                 try
                 {
                     var assy = loadedAssembly.Assembly;
-                    var types = assy.GetTypes();
+                    CType[] types = {};
+                    try
+                    {
+                        types = assy.GetTypes();
+                    }
+                    catch (TypeLoadException e)
+                    {
+                        Debug.Console(0, Debug.ErrorLogLevel.Warning, "Unable to get types for assembly {0}: {1}",
+                            loadedAssembly.Name, e.Message);
+                        Debug.Console(2, e.StackTrace);
+                        continue;
+                    }
+
                     foreach (var type in types)
                     {
                         try
                         {
-                            if (typeof(IPluginDeviceFactory).IsAssignableFrom(type))
+                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type) && !type.IsAbstract)
                             {
-                                var plugin = (IPluginDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
+                                var plugin =
+                                    (IPluginDeviceFactory) Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
                                 LoadCustomPlugin(plugin, loadedAssembly);
                             }
                             else
@@ -378,10 +391,15 @@ namespace PepperDash.Essentials
                                 }
                             }
                         }
+                        catch (NotSupportedException e)
+                        {
+                            //this happens for dlls that aren't PD dlls, like ports of Mono classes into S#. Swallowing.
+                               
+                        }
                         catch (Exception e)
                         {
                             Debug.Console(2, "Load Plugin not found. {0}.{2} is not a plugin factory. Exception: {1}",
-                                loadedAssembly.Name, e, type.Name);
+                                loadedAssembly.Name, e.Message, type.Name);
                             continue;
                         }
 
@@ -389,7 +407,9 @@ namespace PepperDash.Essentials
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(2, "Error Loading Assembly: {0} Exception: {1} ", loadedAssembly.Name, e);
+                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "Error Loading assembly {0}: {1}",
+                           loadedAssembly.Name, e.Message);
+                    Debug.Console(2, "{0}", e.StackTrace);
                     continue;
                 }
             }
@@ -402,13 +422,16 @@ namespace PepperDash.Essentials
         /// Loads a
         /// </summary>
         /// <param name="plugin"></param>
+        /// <param name="loadedAssembly"></param>
         static void LoadCustomPlugin(IPluginDeviceFactory plugin, LoadedAssembly loadedAssembly)
         {
             var passed = Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
 
             if (!passed)
             {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", plugin.MinimumEssentialsFrameworkVersion);
+                Debug.Console(0, Debug.ErrorLogLevel.Error,
+                    "\r\n********************\r\n\tPlugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin {1}\r\n********************",
+                    plugin.MinimumEssentialsFrameworkVersion, loadedAssembly.Name);
                 return;
             }
             else

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/DevicePresets.cs

@@ -1,178 +1,300 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
-
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
 using PepperDash.Core;
 
 //using SSMono.IO;
+using PepperDash.Core.WebApi.Presets;
 
 namespace PepperDash.Essentials.Core.Presets
 {
-	/// <summary>
-	/// Class that represents the model behind presets display
-	/// </summary>
-	public class DevicePresetsModel : Device
-	{
-		public event EventHandler PresetsLoaded;
+    /// <summary>
+    /// Class that represents the model behind presets display
+    /// </summary>
+    public class DevicePresetsModel : Device
+    {
+        public delegate void PresetRecalledCallback(ISetTopBoxNumericKeypad device, string channel);
 
-		public int PulseTime { get; set; }
-		public int DigitSpacingMS { get; set; }
-		public bool PresetsAreLoaded { get; private set; }
+        public delegate void PresetsSavedCallback(List<PresetChannel> presets);
 
-		public List<PresetChannel> PresetsList { get { return _PresetsList.ToList(); } }
-		List<PresetChannel> _PresetsList;
-		public int Count { get { return PresetsList != null ? PresetsList.Count : 0; } }
+        private readonly CCriticalSection _fileOps = new CCriticalSection();
+        private readonly bool _initSuccess;
 
-		public bool UseLocalImageStorage { get; set; }
-		public string ImagesLocalHostPrefix { get; set; }
-		public string ImagesPathPrefix { get; set; }
-		public string ListPathPrefix { get; set; }
+        private readonly ISetTopBoxNumericKeypad _setTopBox;
 
-		/// <summary>
-		/// The methods on the STB device to call when dialing
-		/// </summary>
-		Dictionary<char, Action<bool>> DialFunctions;
-		Action<bool> EnterFunction;
+        /// <summary>
+        /// The methods on the STB device to call when dialing
+        /// </summary>
+        private Dictionary<char, Action<bool>> _dialFunctions;
 
-		bool DialIsRunning;
-		string FilePath;
-		bool InitSuccess;
-        //SSMono.IO.FileSystemWatcher ListWatcher;
+        private bool _dialIsRunning;
+        private Action<bool> _enterFunction;
+        private string _filePath;
 
-		public DevicePresetsModel(string key, ISetTopBoxNumericKeypad setTopBox, string fileName)
-			: base(key)
-		{
-			PulseTime = 150;
-			DigitSpacingMS = 150;
+        public DevicePresetsModel(string key, ISetTopBoxNumericKeypad setTopBox, string fileName)
+            : this(key, fileName)
+        {
+            try
+            {
+                _setTopBox = setTopBox;
 
-			try
-			{
-				// Grab the digit functions from the device
-				// If any fail, the whole thing fails peacefully
-				DialFunctions = new Dictionary<char, Action<bool>>(10)
-				{
-					{ '1', setTopBox.Digit1 },
-					{ '2', setTopBox.Digit2 },
-					{ '3', setTopBox.Digit3 },
-					{ '4', setTopBox.Digit4 },
-					{ '5', setTopBox.Digit5 },
-					{ '6', setTopBox.Digit6 },
-					{ '7', setTopBox.Digit7 },
-					{ '8', setTopBox.Digit8 },
-					{ '9', setTopBox.Digit9 },
-					{ '0', setTopBox.Digit0 },
-					{ '-', setTopBox.Dash }
-				};
-			}
-			catch
-			{
-				Debug.Console(0, "DevicePresets '{0}', not attached to INumericKeypad device. Ignoring", key);
-				DialFunctions = null;
-				return;
-			}
+                // Grab the digit functions from the device
+                // If any fail, the whole thing fails peacefully
+                _dialFunctions = new Dictionary<char, Action<bool>>(10)
+                {
+                    {'1', setTopBox.Digit1},
+                    {'2', setTopBox.Digit2},
+                    {'3', setTopBox.Digit3},
+                    {'4', setTopBox.Digit4},
+                    {'5', setTopBox.Digit5},
+                    {'6', setTopBox.Digit6},
+                    {'7', setTopBox.Digit7},
+                    {'8', setTopBox.Digit8},
+                    {'9', setTopBox.Digit9},
+                    {'0', setTopBox.Digit0},
+                    {'-', setTopBox.Dash}
+                };
+            }
+            catch
+            {
+                Debug.Console(0, "DevicePresets '{0}', not attached to INumericKeypad device. Ignoring", key);
+                _dialFunctions = null;
+                return;
+            }
 
-			EnterFunction = setTopBox.KeypadEnter;
+            _enterFunction = setTopBox.KeypadEnter;
+        }
 
-			UseLocalImageStorage = true;
+        public DevicePresetsModel(string key, string fileName) : base(key)
+        {
+            PulseTime = 150;
+            DigitSpacingMs = 150;
 
-			ImagesLocalHostPrefix = "http://" + CrestronEthernetHelper.GetEthernetParameter(
-				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS,0);
-			ImagesPathPrefix = @"/presets/images.zip/";
-			ListPathPrefix = @"/html/presets/lists/";
+            UseLocalImageStorage = true;
 
-			SetFileName(fileName);
+            ImagesLocalHostPrefix = "http://" + CrestronEthernetHelper.GetEthernetParameter(
+                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
+            ImagesPathPrefix = @"/presets/images.zip/";
+            ListPathPrefix = @"/html/presets/lists/";
 
-            //ListWatcher = new FileSystemWatcher(@"\HTML\presets\lists");
-            //ListWatcher.NotifyFilter = NotifyFilters.LastWrite;
-            //ListWatcher.EnableRaisingEvents = true;
-            //ListWatcher.Changed += ListWatcher_Changed;
-			InitSuccess = true;
-		}
+            SetFileName(fileName);
+
+            _initSuccess = true;
+        }
+
+        public event PresetRecalledCallback PresetRecalled;
+        public event PresetsSavedCallback PresetsSaved;
+
+        public int PulseTime { get; set; }
+        public int DigitSpacingMs { get; set; }
+        public bool PresetsAreLoaded { get; private set; }
+
+        public List<PresetChannel> PresetsList { get; private set; }
+
+        public int Count
+        {
+            get { return PresetsList != null ? PresetsList.Count : 0; }
+        }
+
+        public bool UseLocalImageStorage { get; set; }
+        public string ImagesLocalHostPrefix { get; set; }
+        public string ImagesPathPrefix { get; set; }
+        public string ListPathPrefix { get; set; }
+        public event EventHandler PresetsLoaded;
 
 
-		public void SetFileName(string path)
-		{
-			FilePath = ListPathPrefix + path;
-			LoadChannels();
-		}	
+        public void SetFileName(string path)
+        {
+            _filePath = ListPathPrefix + path;
 
-		public void LoadChannels()
-		{
-			PresetsAreLoaded = false;
-			try
-			{
-				var pl = JsonConvert.DeserializeObject<PresetsList>(Crestron.SimplSharp.CrestronIO.File.ReadToEnd(FilePath, Encoding.ASCII));
-				Name = pl.Name;
-				_PresetsList = pl.Channels;
-			}
-			catch (Exception e)
-			{
-				Debug.Console(2, this, "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}", FilePath, e.Message);
-				// Just save a default empty list
-				_PresetsList = new List<PresetChannel>();
-			}
-			PresetsAreLoaded = true;
+            Debug.Console(2, this, "Setting presets file path to {0}", _filePath);
+            LoadChannels();
+        }
 
-			var handler = PresetsLoaded;
-			if (handler != null)
-				handler(this, EventArgs.Empty);
-		}
+        public void LoadChannels()
+        {
+            try
+            {
+                _fileOps.Enter();
 
-		public void Dial(int presetNum)
-		{
-			if (presetNum <= _PresetsList.Count)
-				Dial(_PresetsList[presetNum - 1].Channel);
-		}
+                Debug.Console(2, this, "Loading presets from {0}", _filePath);
+                PresetsAreLoaded = false;
+                try
+                {
+                    var pl = JsonConvert.DeserializeObject<PresetsList>(File.ReadToEnd(_filePath, Encoding.ASCII));
+                    Name = pl.Name;
+                    PresetsList = pl.Channels;
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(2, this,
+                        "LoadChannels: Error reading presets file. These presets will be empty:\r  '{0}'\r  Error:{1}",
+                        _filePath, e.Message);
+                    // Just save a default empty list
+                    PresetsList = new List<PresetChannel>();
+                }
+                PresetsAreLoaded = true;
 
-		public void Dial(string chanNum)
-		{
-			if (DialIsRunning || !InitSuccess) return;
-			if (DialFunctions == null)
-			{
-				Debug.Console(1, "DevicePresets '{0}', not attached to keypad device. Ignoring channel", Key);
-				return;
-			}
+                var handler = PresetsLoaded;
+                if (handler != null)
+                {
+                    handler(this, EventArgs.Empty);
+                }
+            }
+            finally
+            {
+                _fileOps.Leave();
+            }
+        }
 
-			DialIsRunning = true;
-			CrestronInvoke.BeginInvoke(o =>
-				{
-					foreach (var c in chanNum.ToCharArray())
-					{
-						if (DialFunctions.ContainsKey(c))
-							Pulse(DialFunctions[c]);
-						CrestronEnvironment.Sleep(DigitSpacingMS);
-					}
+        public void Dial(int presetNum)
+        {
+            if (presetNum <= PresetsList.Count)
+            {
+                Dial(PresetsList[presetNum - 1].Channel);
+            }
+        }
 
-					if (EnterFunction != null)
-						Pulse(EnterFunction);
-					DialIsRunning = false;
-				});
-		}
+        public void Dial(string chanNum)
+        {
+            if (_dialIsRunning || !_initSuccess)
+            {
+                return;
+            }
+            if (_dialFunctions == null)
+            {
+                Debug.Console(1, "DevicePresets '{0}', not attached to keypad device. Ignoring channel", Key);
+                return;
+            }
 
-		void Pulse(Action<bool> act)
-		{
-			act(true);
-			CrestronEnvironment.Sleep(PulseTime);
-			act(false);
-		}
+            _dialIsRunning = true;
+            CrestronInvoke.BeginInvoke(o =>
+            {
+                foreach (var c in chanNum.ToCharArray())
+                {
+                    if (_dialFunctions.ContainsKey(c))
+                    {
+                        Pulse(_dialFunctions[c]);
+                    }
+                    CrestronEnvironment.Sleep(DigitSpacingMs);
+                }
 
-		/// <summary>
-		/// Event handler for filesystem watcher.  When directory changes, this is called
-		/// </summary>
-        //void ListWatcher_Changed(object sender, FileSystemEventArgs e)
-        //{
-        //    Debug.Console(1, this, "folder modified: {0}", e.FullPath);
-        //    if (e.FullPath.Equals(FilePath, StringComparison.OrdinalIgnoreCase))
-        //    {
-        //        Debug.Console(1, this, "File changed: {0}", e.ChangeType);			
-        //        LoadChannels();
-        //    }
-        //}
-	}
+                if (_enterFunction != null)
+                {
+                    Pulse(_enterFunction);
+                }
+                _dialIsRunning = false;
+            });
+
+            if (_setTopBox == null) return;
+
+            OnPresetRecalled(_setTopBox, chanNum);
+        }
+
+        public void Dial(int presetNum, ISetTopBoxNumericKeypad setTopBox)
+        {
+            if (presetNum <= PresetsList.Count)
+            {
+                Dial(PresetsList[presetNum - 1].Channel, setTopBox);
+            }
+        }
+
+        public void Dial(string chanNum, ISetTopBoxNumericKeypad setTopBox)
+        {
+            _dialFunctions = new Dictionary<char, Action<bool>>(10)
+            {
+                {'1', setTopBox.Digit1},
+                {'2', setTopBox.Digit2},
+                {'3', setTopBox.Digit3},
+                {'4', setTopBox.Digit4},
+                {'5', setTopBox.Digit5},
+                {'6', setTopBox.Digit6},
+                {'7', setTopBox.Digit7},
+                {'8', setTopBox.Digit8},
+                {'9', setTopBox.Digit9},
+                {'0', setTopBox.Digit0},
+                {'-', setTopBox.Dash}
+            };
+
+            _enterFunction = setTopBox.KeypadEnter;
+
+            OnPresetRecalled(setTopBox, chanNum);
+
+            Dial(chanNum);
+        }
+
+        private void OnPresetRecalled(ISetTopBoxNumericKeypad setTopBox, string channel)
+        {
+            var handler = PresetRecalled;
+
+            if (handler == null)
+            {
+                return;
+            }
+
+            handler(setTopBox, channel);
+        }
+
+        public void UpdatePreset(int index, PresetChannel preset)
+        {
+            if (index >= PresetsList.Count)
+            {
+                return;
+            }
+
+            PresetsList[index] = preset;
+
+            SavePresets();
+
+            OnPresetsSaved();
+        }
+
+        public void UpdatePresets(List<PresetChannel> presets)
+        {
+            PresetsList = presets;
+
+            SavePresets();
+
+            OnPresetsSaved();
+        }
+
+        private void SavePresets()
+        {
+            try
+            {
+                _fileOps.Enter();
+                var pl = new PresetsList {Channels = PresetsList, Name = Name};
+                var json = JsonConvert.SerializeObject(pl, Formatting.Indented);
+
+                using (var file = File.Open(_filePath, FileMode.Truncate))
+                {
+                    file.Write(json, Encoding.UTF8);
+                }
+            }
+            finally
+            {
+                _fileOps.Leave();
+            }
+            
+        }
+
+        private void OnPresetsSaved()
+        {
+            var handler = PresetsSaved;
+
+            if (handler == null) return;
+
+            handler(PresetsList);
+        }
+
+        private void Pulse(Action<bool> act)
+        {
+            act(true);
+            CrestronEnvironment.Sleep(PulseTime);
+            act(false);
+        }
+    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/PresetChannel.cs

@@ -10,19 +10,22 @@ namespace PepperDash.Essentials.Core.Presets
 	public class PresetChannel
 	{
 
-		[JsonProperty(Required = Required.Always)]
+		[JsonProperty(Required = Required.Always,PropertyName = "name")]
 		public string Name { get; set; }
-		[JsonProperty(Required = Required.Always)]
+
+		[JsonProperty(Required = Required.Always, PropertyName = "iconUrl")]
 		public string IconUrl { get; set; }
-		[JsonProperty(Required = Required.Always)]
+
+		[JsonProperty(Required = Required.Always, PropertyName = "channel")]
 		public string Channel { get; set; }
 	}
 
 	public class PresetsList
 	{
-		[JsonProperty(Required=Required.Always)]
+		[JsonProperty(Required=Required.Always,PropertyName = "name")]
 		public string Name { get; set; }
-		[JsonProperty(Required = Required.Always)]
+
+		[JsonProperty(Required = Required.Always, PropertyName = "channels")]
 		public List<PresetChannel> Channels { get; set; }
 	}
 }

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

@@ -1,7 +1,7 @@
 using System;
 using PepperDash.Core;
 
-namespace PepperDash_Essentials_Core.Queues
+namespace PepperDash.Essentials.Core.Queues
 {
     /// <summary>
     /// IBasicCommunication Message for IQueue
@@ -40,7 +40,79 @@ 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)
+                throw new ArgumentNullException("message");
+        }
+
+        /// <summary>
+        /// Dispatchs the string/byte[] to the IBasicCommunication specified
+        /// </summary>
+        public void Dispatch()
+        {
+            if (_isByteMessage)
+            {
+                _coms.SendBytes(_bytes);
+            }
+            else
+            {
+                _coms.SendText(_string);
+            }
+        }
+
+        /// <summary>
+        /// Shows either the byte[] or string to be sent
+        /// </summary>
+        public override string ToString()
+        {
+            return _bytes != null ? _bytes.ToString() : _string;
+        }
+    }
+}
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// IBasicCommunication Message for IQueue
+    /// </summary>
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public class ComsMessage : IQueueMessage
+    {
+        private readonly byte[] _bytes;
+        private readonly IBasicCommunication _coms;
+        private readonly string _string;
+        private readonly bool _isByteMessage;
+
+        /// <summary>
+        /// Constructor for a string message
+        /// </summary>
+        /// <param name="coms">IBasicCommunication to send the message</param>
+        /// <param name="message">Message to send</param>
+        public ComsMessage(IBasicCommunication coms, string message)
+        {
+            Validate(coms, message);
+            _coms = coms;
+            _string = message;
+        }
+
+        /// <summary>
+        /// Constructor for a byte message
+        /// </summary>
+        /// <param name="coms">IBasicCommunication to send the message</param>
+        /// <param name="message">Message to send</param>
+        public ComsMessage(IBasicCommunication coms, byte[] message)
+        {
+            Validate(coms, message);
+            _coms = coms;
+            _bytes = message;
+            _isByteMessage = true;
+        }
+
+        private void Validate(IBasicCommunication coms, object message)
+        {
+            if (coms == null)
                 throw new ArgumentNullException("coms");
 
             if (message == null)

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

@@ -3,7 +3,7 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
 using PepperDash.Core;
 
-namespace PepperDash_Essentials_Core.Queues
+namespace PepperDash.Essentials.Core.Queues
 {
     /// <summary>
     /// Threadsafe processing of queued items with pacing if required
@@ -14,9 +14,11 @@ namespace PepperDash_Essentials_Core.Queues
         protected readonly CrestronQueue<IQueueMessage> _queue;
         protected readonly Thread _worker;
         protected readonly CEvent _waitHandle = new CEvent();
-        
-        private readonly bool _delayEnabled;
-        private readonly int _delayTime;
+
+        private bool _delayEnabled;
+        private int _delayTime;
+
+        private const Thread.eThreadPriority _defaultPriority = Thread.eThreadPriority.MediumPriority;
 
         /// <summary>
         /// If the instance has been disposed.
@@ -24,22 +26,44 @@ namespace PepperDash_Essentials_Core.Queues
         public bool Disposed { get; private set; }
 
         /// <summary>
-        /// Constructor for generic queue with no pacing
+        /// Returns the capacity of the CrestronQueue (fixed Size property)
         /// </summary>
-        /// <param name="key">Key</param>
-        public GenericQueue(string key)
+        public int QueueCapacity
         {
-            _key = key;
-            _queue = new CrestronQueue<IQueueMessage>();
-            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running);
-
-            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            get
             {
-                if (programEvent != eProgramStatusEventType.Stopping)
-                    return;
+                return _queue.Size;
+            }
+        }
 
-                Dispose();
-            };
+        /// <summary>
+        /// Returns the number of elements currently in the CrestronQueue
+        /// </summary>    
+        public int QueueCount
+        {
+            get
+            {
+                return _queue.Count;
+            }
+        }
+
+        /// <summary>
+        /// Constructor with no thread priority
+        /// </summary>
+        /// <param name="key"></param>
+        public GenericQueue(string key)
+            : this(key, _defaultPriority, 0, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with queue size
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="capacity">Fixed size for the queue to hold</param>
+        public GenericQueue(string key, int capacity)
+            : this(key, _defaultPriority, capacity, 0)
+        {
         }
 
         /// <summary>
@@ -47,11 +71,349 @@ namespace PepperDash_Essentials_Core.Queues
         /// </summary>
         /// <param name="key">Key</param>
         /// <param name="pacing">Pacing in ms between actions</param>
-        public GenericQueue(string key, int pacing)
-            : this(key)
+        public GenericQueue(int pacing, string key)
+            : this(key, _defaultPriority, 0, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, int pacing, int capacity)
+            : this(key, _defaultPriority, capacity, 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, 0, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing, priority and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, Thread.eThreadPriority priority, int capacity)
+            : this(key, priority, capacity, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing, priority and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority, int capacity)
+            : this(key, priority, capacity, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        /// <param name="pacing"></param>
+        protected GenericQueue(string key, Thread.eThreadPriority priority, int capacity, int pacing)
+        {
+            _key = key;
+            int cap = 25; // sets default
+            if (capacity > 0)
+            {
+                cap = capacity; // overrides default
+            }
+            _queue = new CrestronQueue<IQueueMessage>(cap);
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
+            {
+                Priority = priority
+            };
+
+            SetDelayValues(pacing);
+        }
+
+        private void SetDelayValues(int pacing)
         {
             _delayEnabled = pacing > 0;
             _delayTime = pacing;
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose(true);
+            };
+        }
+
+        /// <summary>
+        /// Thread callback
+        /// </summary>
+        /// <param name="obj">The action used to process dequeued items</param>
+        /// <returns>Null when the thread is exited</returns>
+        private object ProcessQueue(object obj)
+        {
+            while (true)
+            {
+                IQueueMessage item = null;
+
+                if (_queue.Count > 0)
+                {
+                    item = _queue.Dequeue();
+                    if (item == null)
+                        break;
+                }
+                if (item != null)
+                {
+                    try
+                    {
+                        //Debug.Console(2, this, "Processing queue item: '{0}'", item.ToString());
+                        item.Dispatch();
+
+                        if (_delayEnabled)
+                            Thread.Sleep(_delayTime);
+                    }
+                    catch (Exception ex)
+                    {
+                        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();
+            }
+
+            return null;
+        }
+
+        public void Enqueue(IQueueMessage item)
+        {
+            if (Disposed)
+            {
+                Debug.Console(1, this, "I've been disposed so you can't enqueue any messages.  Are you trying to dispatch a message while the program is stopping?");
+                return;
+            }
+
+            _queue.Enqueue(item);
+            _waitHandle.Set();
+        }
+
+        /// <summary>
+        /// Disposes the thread and cleans up resources.  Thread cannot be restarted once
+        /// disposed.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            CrestronEnvironment.GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Actually does the disposing.  If you override this method, be sure to either call the base implementation 
+        /// or clean up all the resources yourself.
+        /// </summary>
+        /// <param name="disposing">set to true unless called from finalizer</param>
+        protected void Dispose(bool disposing)
+        {
+            if (Disposed)
+                return;
+
+            if (disposing)
+            {
+                Debug.Console(2, this, "Disposing...");
+                if (_queue != null && !_queue.Disposed)
+                {
+                    _queue.Clear();
+                    Enqueue(null);
+                }
+                _worker.Abort();
+                _waitHandle.Close();
+            }
+
+            Disposed = true;
+        }
+
+        ~GenericQueue()
+        {
+            Dispose(true);
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _key; }
+        }
+    }
+}
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Threadsafe processing of queued items with pacing if required
+    /// </summary>
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public class GenericQueue : IQueue<IQueueMessage>
+    {
+        private readonly string _key;
+        protected readonly CrestronQueue<IQueueMessage> _queue;
+        protected readonly Thread _worker;
+        protected readonly CEvent _waitHandle = new CEvent();
+
+        private bool _delayEnabled;
+        private int _delayTime;
+
+        private const Thread.eThreadPriority _defaultPriority = Thread.eThreadPriority.MediumPriority;
+
+        /// <summary>
+        /// If the instance has been disposed.
+        /// </summary>
+        public bool Disposed { get; private set; }
+
+        /// <summary>
+        /// Returns the capacity of the CrestronQueue (fixed Size property)
+        /// </summary>
+        public int QueueCapacity
+        {
+            get
+            {
+                return _queue.Size;
+            }
+        }
+
+        /// <summary>
+        /// Returns the number of elements currently in the CrestronQueue
+        /// </summary>    
+        public int QueueCount
+        {
+            get
+            {
+                return _queue.Count;
+            }
+        }
+
+        /// <summary>
+        /// Constructor with no thread priority
+        /// </summary>
+        /// <param name="key"></param>
+        public GenericQueue(string key)
+            : this(key, _defaultPriority, 0, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with queue size
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="capacity">Fixed size for the queue to hold</param>
+        public GenericQueue(string key, int capacity)
+            : this(key, _defaultPriority, capacity, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="pacing">Pacing in ms between actions</param>
+        public GenericQueue(int pacing, string key)
+            : this(key, _defaultPriority, 0, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, int pacing, int capacity)
+            : this(key, _defaultPriority, capacity, 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, 0, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing, priority and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, Thread.eThreadPriority priority, int capacity)
+            : this(key, priority, capacity, 0)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with pacing, priority and capacity
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="pacing"></param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        public GenericQueue(string key, int pacing, Thread.eThreadPriority priority, int capacity)
+            : this(key, priority, capacity, pacing)
+        {
+        }
+
+        /// <summary>
+        /// Constructor for generic queue with no pacing
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="priority"></param>
+        /// <param name="capacity"></param>
+        /// <param name="pacing"></param>
+        protected GenericQueue(string key, Thread.eThreadPriority priority, int capacity, int pacing)
+        {
+            _key = key;
+            int cap = 25; // sets default
+            if (capacity > 0)
+            {
+                cap = capacity; // overrides default
+            }
+            _queue = new CrestronQueue<IQueueMessage>(cap);
+            _worker = new Thread(ProcessQueue, null, Thread.eThreadStartOptions.Running)
+            {
+                Priority = priority
+            };
+
+            SetDelayValues(pacing);
+        }
+
+        private void SetDelayValues(int pacing)
+        {
+            _delayEnabled = pacing > 0;
+            _delayTime = pacing;
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose(true);
+            };
         }
 
         /// <summary>
@@ -83,7 +445,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();
@@ -120,8 +482,13 @@ namespace PepperDash_Essentials_Core.Queues
 
             if (disposing)
             {
-                Enqueue(null);
-                _worker.Join();
+                Debug.Console(2, this, "Disposing...");
+                if (_queue != null && !_queue.Disposed)
+                {
+                    _queue.Clear();
+                    Enqueue(null);
+                }
+                _worker.Abort();
                 _waitHandle.Close();
             }
 
@@ -130,7 +497,7 @@ namespace PepperDash_Essentials_Core.Queues
 
         ~GenericQueue()
         {
-            Dispose(false);
+            Dispose(true);
         }
 
         /// <summary>

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

@@ -5,11 +5,21 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 
-namespace PepperDash_Essentials_Core.Queues
+namespace PepperDash.Essentials.Core.Queues
 {
     public interface IQueue<T> : IKeyed, IDisposable where T : class 
     {
         void Enqueue(T item);
         bool Disposed { get; }
     }
+}
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public interface IQueue<T> : IKeyed, IDisposable where T : class
+    {
+        void Enqueue(T item);
+        bool Disposed { get; }
+    }
 }

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

@@ -1,7 +1,18 @@
-namespace PepperDash_Essentials_Core.Queues
+using System;
+
+namespace PepperDash.Essentials.Core.Queues
 {
     public interface IQueueMessage
     {
         void Dispatch();
     }
+}
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public interface IQueueMessage
+    {
+        void Dispatch();
+    }
 }

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

@@ -1,6 +1,6 @@
 using System;
 
-namespace PepperDash_Essentials_Core.Queues
+namespace PepperDash.Essentials.Core.Queues
 {
     /// <summary>
     /// Message class for processing strings via an IQueue
@@ -32,6 +32,50 @@ namespace PepperDash_Essentials_Core.Queues
             _action(_message);
         }
 
+        /// <summary>
+        /// To string
+        /// </summary>
+        /// <returns>The current message</returns>
+        public override string ToString()
+        {
+            return _message ?? String.Empty;
+        }
+    }
+}
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Message class for processing strings via an IQueue
+    /// </summary>
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public class ProcessStringMessage : IQueueMessage
+    {
+        private readonly Action<string> _action;
+        private readonly string _message;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="message">Message to be processed</param>
+        /// <param name="action">Action to invoke on the message</param>
+        public ProcessStringMessage(string message, Action<string> action)
+        {
+            _message = message;
+            _action = action;
+        }
+
+        /// <summary>
+        /// Processes the string with the given action
+        /// </summary>
+        public void Dispatch()
+        {
+            if (_action == null || String.IsNullOrEmpty(_message))
+                return;
+
+            _action(_message);
+        }
+
         /// <summary>
         /// To string
         /// </summary>

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

@@ -2,7 +2,7 @@
 using Crestron.SimplSharp;
 using PepperDash.Core;
 
-namespace PepperDash_Essentials_Core.Queues
+namespace PepperDash.Essentials.Core.Queues
 {
     public sealed class StringResponseProcessor : IKeyed, IDisposable
     {
@@ -98,6 +98,110 @@ namespace PepperDash_Essentials_Core.Queues
         /// </summary>
         public bool Disposed { get; private set; }
 
+        ~StringResponseProcessor()
+        {
+            Dispose(false);
+        }
+    }
+}
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public sealed class StringResponseProcessor : IKeyed, IDisposable
+    {
+        private readonly Action<string> _processStringAction;
+        private readonly IQueue<IQueueMessage> _queue;
+        private readonly IBasicCommunication _coms;
+        private readonly CommunicationGather _gather;
+
+        private StringResponseProcessor(string key, Action<string> processStringAction)
+        {
+            _processStringAction = processStringAction;
+            _queue = new GenericQueue(key);
+
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;
+
+                Dispose();
+            };
+        }
+
+        /// <summary>
+        /// Constructor that builds an instance and subscribes to coms TextReceived for processing
+        /// </summary>
+        /// <param name="coms">Com port to process strings from</param>
+        /// <param name="processStringAction">Action to process the incoming strings</param>
+        public StringResponseProcessor(IBasicCommunication coms, Action<string> processStringAction)
+            : this(coms.Key, processStringAction)
+        {
+            _coms = coms;
+            coms.TextReceived += OnResponseReceived;
+        }
+
+        /// <summary>
+        /// Constructor that builds an instance and subscribes to gather Line Received for processing
+        /// </summary>
+        /// <param name="gather">Gather to process strings from</param>
+        /// <param name="processStringAction">Action to process the incoming strings</param>
+        public StringResponseProcessor(CommunicationGather gather, Action<string> processStringAction)
+            : this(gather.Port.Key, processStringAction)
+        {
+            _gather = gather;
+            gather.LineReceived += OnResponseReceived;
+        }
+
+        private void OnResponseReceived(object sender, GenericCommMethodReceiveTextArgs args)
+        {
+            _queue.Enqueue(new ProcessStringMessage(args.Text, _processStringAction));
+        }
+
+        /// <summary>
+        /// Key
+        /// </summary>
+        public string Key
+        {
+            get { return _queue.Key; }
+        }
+
+        /// <summary>
+        /// Disposes the instance and cleans up resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            CrestronEnvironment.GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (Disposed)
+                return;
+
+            if (disposing)
+            {
+                if (_coms != null)
+                    _coms.TextReceived -= OnResponseReceived;
+
+                if (_gather != null)
+                {
+                    _gather.LineReceived -= OnResponseReceived;
+                    _gather.Stop();
+                }
+
+                _queue.Dispose();
+            }
+
+            Disposed = true;
+        }
+
+        /// <summary>
+        /// If the instance has been disposed or not.  If it has, you can not use it anymore
+        /// </summary>
+        public bool Disposed { get; private set; }
+
         ~StringResponseProcessor()
         {
             Dispose(false);

essentials-framework/Essentials Core/PepperDashEssentialsBase/Remotes/Hrxx0WirelessRemoteController.cs

@@ -83,7 +83,7 @@ namespace PepperDash.Essentials.Core
             }
         }
 
-        void _gateway_IsReadyEvent(object sender, PepperDash_Essentials_Core.IsReadyEventArgs e)
+        void _gateway_IsReadyEvent(object sender, IsReadyEventArgs e)
         {
             if (e.IsReady != true) return;
             _remote = GetHr1x0WirelessRemote(_config);

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

@@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core
 
         ScheduledEventGroup FeatureEventGroup;
 
-        public EssentialsRoomBase Room { get; private set; }
+        public IEssentialsRoom Room { get; private set; }
 
         private Fusion.EssentialsHuddleSpaceFusionSystemControllerBase FusionRoom;
 
@@ -84,7 +84,7 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         void SetUpDevice()
         {
-            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as EssentialsRoomBase;
+            Room = DeviceManager.GetDeviceForKey(PropertiesConfig.RoomKey) as IEssentialsRoom;
 
             if (Room != null)
             {
@@ -169,10 +169,15 @@ namespace PepperDash.Essentials.Core
 
         void FeatureEventGroup_UserGroupCallBack(ScheduledEvent SchEvent, ScheduledEventCommon.eCallbackReason type)
         {
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "{0}:{1} @ {2}", SchEvent.Name, type, DateTime.Now);
+
             if (type == ScheduledEventCommon.eCallbackReason.NormalExpiration)
             {
+                SchEvent.Acknowledge();
+
                 if (SchEvent.Name == FeatureEnableEventName)
                 {
+                    
                     if (PropertiesConfig.EnableRoomOnWhenOccupied)
                         FeatureEnabled = true;
 
@@ -248,9 +253,8 @@ namespace PepperDash.Essentials.Core
                 schEvent = new ScheduledEvent(name, FeatureEventGroup);
 
             // Set up its initial properties
-
-            if(!schEvent.Acknowledgeable)
-                schEvent.Acknowledgeable = true;
+            
+            schEvent.Acknowledgeable = false;
 
             if(!schEvent.Persistent)
                 schEvent.Persistent = true;
@@ -287,7 +291,7 @@ namespace PepperDash.Essentials.Core
 
                 Debug.Console(1, this, "Event '{0}' Absolute time set to {1}", schEvent.Name, schEvent.DateAndTime.ToString());
 
-                CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);
+                //CalculateAndSetAcknowledgeExpirationTimeout(schEvent, FeatureEnabledTime, FeatureDisabledTime);
 
                 schEvent.Recurrence.Weekly(eventRecurrennce);
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombiner.cs

@@ -0,0 +1,297 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public class EssentialsRoomCombiner : EssentialsDevice, IEssentialsRoomCombiner
+    {
+        private EssentialsRoomCombinerPropertiesConfig _propertiesConfig;
+
+        private IRoomCombinationScenario _currentScenario;
+
+        private List<IEssentialsRoom> _rooms;
+
+        private bool isInAutoMode;
+
+        private CTimer _scenarioChangeDebounceTimer;
+
+        private int _scenarioChangeDebounceTimeSeconds = 10; // default to 10s
+
+        public EssentialsRoomCombiner(string key, EssentialsRoomCombinerPropertiesConfig props)
+            : base(key)
+        {
+            _propertiesConfig = props;
+
+            Partitions = new List<IPartitionController>();
+            RoomCombinationScenarios = new List<IRoomCombinationScenario>();
+
+            if (_propertiesConfig.ScenarioChangeDebounceTimeSeconds > 0)
+            {
+                _scenarioChangeDebounceTimeSeconds = _propertiesConfig.ScenarioChangeDebounceTimeSeconds;
+            }
+
+            IsInAutoModeFeedback = new BoolFeedback(() => isInAutoMode);
+
+            // default to auto mode
+            isInAutoMode = true;
+
+            if (_propertiesConfig.defaultToManualMode)
+            {
+                isInAutoMode = false;
+            }
+
+            IsInAutoModeFeedback.FireUpdate();
+
+            CreateScenarios();
+
+            AddPostActivationAction(() =>
+            {
+                SetupPartitionStateProviders();
+
+                SetRooms();
+
+                if (isInAutoMode)
+                {
+                    DetermineRoomCombinationScenario();
+                }
+                else
+                {
+                    SetRoomCombinationScenario(_propertiesConfig.defaultScenarioKey);
+                }
+            });
+        }
+
+        void CreateScenarios()
+        {
+            foreach (var scenarioConfig in _propertiesConfig.Scenarios)
+            {
+                var scenario = new RoomCombinationScenario(scenarioConfig);
+                RoomCombinationScenarios.Add(scenario);
+            }
+        }
+
+        void SetRooms()
+        {
+            _rooms = new List<IEssentialsRoom>();
+
+            foreach (var roomKey in _propertiesConfig.RoomKeys)
+            {
+                var room = DeviceManager.GetDeviceForKey(roomKey) as IEssentialsRoom;
+                if (room != null)
+                {
+                    _rooms.Add(room);
+                }
+            }
+        }
+
+        void SetupPartitionStateProviders()
+        {
+            foreach (var pConfig in _propertiesConfig.Partitions)
+            {
+                var sensor = DeviceManager.GetDeviceForKey(pConfig.DeviceKey) as IPartitionStateProvider;
+
+                var partition = new EssentialsPartitionController(pConfig.Key, pConfig.Name, sensor, _propertiesConfig.defaultToManualMode, pConfig.AdjacentRoomKeys);
+
+                partition.PartitionPresentFeedback.OutputChange += PartitionPresentFeedback_OutputChange;
+
+                Partitions.Add(partition);
+            }
+        }
+
+        void PartitionPresentFeedback_OutputChange(object sender, FeedbackEventArgs e)
+        {
+            StartDebounceTimer();
+        }
+
+        void StartDebounceTimer()
+        {
+            var time = _scenarioChangeDebounceTimeSeconds * 1000;
+
+            if (_scenarioChangeDebounceTimer == null)
+            {
+                _scenarioChangeDebounceTimer = new CTimer((o) => DetermineRoomCombinationScenario(), time);
+            }
+            else
+            {
+                _scenarioChangeDebounceTimer.Reset(time);
+            }
+        }
+
+        /// <summary>
+        /// Determines the current room combination scenario based on the state of the partition sensors
+        /// </summary>
+        void DetermineRoomCombinationScenario()
+        {
+            if (_scenarioChangeDebounceTimer != null)
+            {
+                _scenarioChangeDebounceTimer.Dispose();
+                _scenarioChangeDebounceTimer = null;
+            }
+
+            var currentScenario = RoomCombinationScenarios.FirstOrDefault((s) =>
+            {
+                // iterate the partition states
+                foreach (var partitionState in s.PartitionStates)
+                {
+                    // get the partition by key
+                    var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionState.PartitionKey));
+
+                    if (partition != null && partitionState.PartitionPresent != partition.PartitionPresentFeedback.BoolValue)
+                    {
+                        // the partition can't be found or the state doesn't match
+                        return false;
+                    }
+                }
+                // if it hasn't returned false by now we have the matching scenario
+                return true;
+            });
+
+            if (currentScenario != null)
+            {
+                CurrentScenario = currentScenario;
+            }
+        }
+
+        #region IEssentialsRoomCombiner Members
+
+        public event EventHandler<EventArgs> RoomCombinationScenarioChanged;
+
+        public IRoomCombinationScenario CurrentScenario
+        {
+            get
+            {
+                return _currentScenario;
+            }
+            private set
+            {
+                if (value != _currentScenario)
+                {
+                    // Deactivate the old scenario first
+                    if (_currentScenario != null)
+                    {
+                        _currentScenario.Deactivate();
+                    }
+
+                    _currentScenario = value;
+
+                    // Activate the new scenario
+                    if (_currentScenario != null)
+                    {
+                        _currentScenario.Activate();
+
+                        Debug.Console(1, this, "Current Scenario: {0}", _currentScenario.Name);
+                    }
+
+                    var handler = RoomCombinationScenarioChanged;
+                    if (handler != null)
+                    {
+                        handler(this, new EventArgs());
+                    }
+                }
+            }
+        }
+
+        public BoolFeedback IsInAutoModeFeedback { get; private set; }
+
+        public void SetAutoMode()
+        {
+            isInAutoMode = true;
+            IsInAutoModeFeedback.FireUpdate();
+        }
+
+        public void SetManualMode()
+        {
+            isInAutoMode = false;
+            IsInAutoModeFeedback.FireUpdate();
+        }
+
+        public void ToggleMode()
+        {
+            isInAutoMode = !isInAutoMode;
+            IsInAutoModeFeedback.FireUpdate();
+        }
+
+        public List<IRoomCombinationScenario> RoomCombinationScenarios { get; private set; }
+
+        public List<IPartitionController> Partitions { get; private set; }
+
+        public void TogglePartitionState(string partitionKey)
+        {
+            var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionKey)) as IPartitionController;
+
+            if (partition != null)
+            {
+                partition.ToggglePartitionState();
+            }
+        }
+
+        public void SetRoomCombinationScenario(string scenarioKey)
+        {
+            if (isInAutoMode)
+            {
+                Debug.Console(0, this, "Cannot set room combination scenario when in auto mode.  Set to auto mode first.");
+                return;
+            }
+
+            // Get the scenario
+            var scenario = RoomCombinationScenarios.FirstOrDefault((s) => s.Key.Equals(scenarioKey));
+
+
+            // Set the parition states from the scenario manually
+            if (scenario != null)
+            {
+                Debug.Console(0, this, "Manually setting scenario to '{0}'", scenario.Key);
+                foreach (var partitionState in scenario.PartitionStates)
+                {
+                    var partition = Partitions.FirstOrDefault((p) => p.Key.Equals(partitionState.PartitionKey));
+
+                    if (partition != null)
+                    {
+                        if (partitionState.PartitionPresent)
+                        {
+                            Debug.Console(0, this, "Manually setting state to Present for: '{0}'", partition.Key);
+                            partition.SetPartitionStatePresent();
+                        }
+                        else
+                        {
+                            Debug.Console(0, this, "Manually setting state to Not Present for: '{0}'", partition.Key);
+                            partition.SetPartitionStateNotPresent();
+                        }
+                    }
+                    else
+                    {
+                        Debug.Console(1, this, "Unable to find partition with key: '{0}'", partitionState.PartitionKey);
+                    }
+                }
+            }
+            else
+            {
+                Debug.Console(1, this, "Unable to find scenario with key: '{0}'", scenarioKey);
+            }
+        }
+
+        #endregion
+    }
+
+    public class EssentialsRoomCombinerFactory : EssentialsDeviceFactory<EssentialsRoomCombiner>
+    {
+        public EssentialsRoomCombinerFactory()
+        {
+            TypeNames = new List<string> { "essentialsroomcombiner" };
+        }
+
+        public override EssentialsDevice BuildDevice(PepperDash.Essentials.Core.Config.DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new EssentialsRoomCombiner Device");
+
+            var props = dc.Properties.ToObject<EssentialsRoomCombinerPropertiesConfig>();
+
+            return new EssentialsRoomCombiner(dc.Key, props);
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs

@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Config properties for an EssentialsRoomCombiner device
+    /// </summary>
+    public class EssentialsRoomCombinerPropertiesConfig
+    {
+        /// <summary>
+        /// The list of partitions that device the rooms
+        /// </summary>
+        [JsonProperty("partitions")]
+        public List<PartitionConfig> Partitions {get; set;}
+
+        /// <summary>
+        /// The list of combinations scenarios for the rooms
+        /// </summary>
+        [JsonProperty("scenarios")]
+        public List<RoomCombinationScenarioConfig> Scenarios { get; set; }
+
+        /// <summary>
+        /// The list of rooms keys that can be combined
+        /// </summary>
+        [JsonProperty("roomKeys")]
+        public List<string> RoomKeys {get; set;}
+
+        /// <summary>
+        /// Set to true to default to manual mode
+        /// </summary>
+        [JsonProperty("defaultToManualMode")]
+        public bool defaultToManualMode { get; set; }
+
+        /// <summary>
+        /// The key of the scenario to default to at system startup if in manual mode
+        /// </summary>
+        [JsonProperty("defaultScenarioKey")]
+        public string defaultScenarioKey { get; set; }
+
+        [JsonProperty("scenarioChangeDebounceTimeSeconds")]
+        public int ScenarioChangeDebounceTimeSeconds { get; set; }
+    }
+
+    /// <summary>
+    /// Config properties for a partition that separates rooms
+    /// </summary>
+    public class PartitionConfig : IKeyName
+    {
+        [JsonProperty("key")]
+        public string Key { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Key of the device that implements IPartitionStateProvider to provide the state of the partition
+        /// </summary>
+        [JsonProperty("deviceKey")]
+        public string DeviceKey { get; set; }
+
+        /// <summary>
+        /// Keys of the rooms that this partion would be located between
+        /// </summary>
+        [JsonProperty("adjacentRoomKeys")]
+        public List<string> AdjacentRoomKeys { get; set; }
+    }
+
+    /// <summary>
+    /// Config propeties for a room combination scenario
+    /// </summary>
+    public class RoomCombinationScenarioConfig : IKeyName
+    {
+        [JsonProperty("key")]
+        public string Key { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("partitionStates")]
+        public List<PartitionState> PartitionStates { get; set; }
+
+        /// <summary>
+        /// Determines which UI devices get mapped to which room in this scenario.  The Key should be the key of the UI device and the Value should be the key of the room to map to
+        /// </summary>
+        [JsonProperty("uiMap")]
+        public Dictionary<string, string> UiMap { get; set; }
+
+        [JsonProperty("activationActions")]
+        public List<DeviceActionWrapper> ActivationActions { get; set; }
+
+        [JsonProperty("deactivationActions")]
+        public List<DeviceActionWrapper> DeactivationActions { get; set; }    
+    }
+
+    /// <summary>
+    /// Config properties to represent the state of a partition sensor in a RoomCombinationScenario
+    /// </summary>
+    public class PartitionState
+    {
+        [JsonProperty("partitionKey")]
+        public string PartitionKey { get; set; }
+
+        [JsonProperty("partitionSensedState")]
+        public bool PartitionPresent { get; set; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Combining/IEssentialsRoomCombiner.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Describes the functionality for an EssentailsRoomCombiner device
+    /// </summary>
+    public interface IEssentialsRoomCombiner : IKeyed
+    {
+        /// <summary>
+        /// Indicates that the room combination scenario has changed
+        /// </summary>
+        event EventHandler<EventArgs> RoomCombinationScenarioChanged;
+
+        /// <summary>
+        /// The current room combination scenario
+        /// </summary>
+        IRoomCombinationScenario CurrentScenario { get; }
+
+        /// <summary>
+        /// When true, indicates the current mode is auto mode
+        /// </summary>
+        BoolFeedback IsInAutoModeFeedback {get;}
+
+        /// <summary>
+        /// Sets auto mode
+        /// </summary>
+        void SetAutoMode();
+
+        /// <summary>
+        /// Sets manual mode
+        /// </summary>
+        void SetManualMode();
+
+        /// <summary>
+        /// Toggles the current mode between auto and manual
+        /// </summary>
+        void ToggleMode();
+
+        /// <summary>
+        /// The available room combinatino scenarios
+        /// </summary>
+        List<IRoomCombinationScenario> RoomCombinationScenarios { get; }
+
+        /// <summary>
+        /// The partition
+        /// </summary>
+        List<IPartitionController> Partitions { get; }
+
+        /// <summary>
+        /// Toggles the state of a manual partition sensor
+        /// </summary>
+        /// <param name="partitionKey"></param>
+        void TogglePartitionState(string partitionKey);
+
+        /// <summary>
+        /// Sets the room combination scenario (if in manual mode)
+        /// </summary>
+        /// <param name="scenarioKey"></param>
+        void SetRoomCombinationScenario(string scenarioKey);
+    }
+
+    public interface IRoomCombinationScenario : IKeyName
+    {
+        /// <summary>
+        /// When true, indicates that this room combination scenario is active
+        /// </summary>
+        BoolFeedback IsActiveFeedback { get; }
+
+        /// <summary>
+        /// Activates this room combination scenario
+        /// </summary>
+        void Activate();
+
+        /// <summary>
+        /// Deactivates this room combination scenario
+        /// </summary>
+        void Deactivate();
+
+        /// <summary>
+        /// The state of the partitions that would activate this scenario
+        /// </summary>
+        List<PartitionState> PartitionStates { get; }
+
+        /// <summary>
+        /// The mapping of UIs by key to rooms by key
+        /// </summary>
+        Dictionary<string, string> UiMap { get; set; }
+    }
+
+}