Merge branch 'development' into bugfix/countdownTimer-fixes

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -13,7 +13,7 @@ using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
-using PepperDash_Essentials_Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials
 {

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

@@ -1,7 +1,7 @@
 using System;
 using PepperDash.Essentials.Core;
 
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 {
     public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
     {
@@ -139,3 +139,23 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
         }
     }
 }
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Obsolete("use PepperDash.Essentials.Core.Bridges.JoinMaps version")]
+	public class GlsPartitionSensorJoinMap : PepperDash.Essentials.Core.Bridges.JoinMaps.GlsPartitionSensorJoinMap
+	{
+        public GlsPartitionSensorJoinMap(uint joinStart)
+            : this(joinStart, typeof(GlsPartitionSensorJoinMap))
+        {
+
+        }
+
+        protected GlsPartitionSensorJoinMap(uint joinStart, Type type) : base(joinStart, type)
+        {
+        }
+	}
+}

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

@@ -1,13 +1,13 @@
 using System;
 using PepperDash.Essentials.Core;
-
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps
-namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 {
     public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced
     {
         #region Status
 
-        [JoinName("IsOnline")] public JoinDataComplete IsOnline =
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline =
             new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -18,7 +18,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 
         #endregion
 
-        [JoinName("CallDirection")] public JoinDataComplete CallDirection =
+        [JoinName("CallDirection")]
+        public JoinDataComplete CallDirection =
             new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -27,7 +28,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("CameraLayout")] public JoinDataComplete CameraLayout =
+        [JoinName("CameraLayout")]
+        public JoinDataComplete CameraLayout =
             new JoinDataComplete(new JoinData { JoinNumber = 142, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -36,7 +38,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraLayoutStringFb")] public JoinDataComplete CameraLayoutStringFb =
+        [JoinName("CameraLayoutStringFb")]
+        public JoinDataComplete CameraLayoutStringFb =
             new JoinDataComplete(new JoinData { JoinNumber = 141, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -45,7 +48,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("CameraModeAuto")] public JoinDataComplete CameraModeAuto =
+        [JoinName("CameraModeAuto")]
+        public JoinDataComplete CameraModeAuto =
             new JoinDataComplete(new JoinData { JoinNumber = 131, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -54,7 +58,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraModeManual")] public JoinDataComplete CameraModeManual =
+        [JoinName("CameraModeManual")]
+        public JoinDataComplete CameraModeManual =
             new JoinDataComplete(new JoinData { JoinNumber = 132, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -63,7 +68,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraModeOff")] public JoinDataComplete CameraModeOff =
+        [JoinName("CameraModeOff")]
+        public JoinDataComplete CameraModeOff =
             new JoinDataComplete(new JoinData { JoinNumber = 133, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -72,7 +78,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraNumberSelect")] public JoinDataComplete CameraNumberSelect =
+        [JoinName("CameraNumberSelect")]
+        public JoinDataComplete CameraNumberSelect =
             new JoinDataComplete(new JoinData { JoinNumber = 60, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -81,7 +88,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("CameraPanLeft")] public JoinDataComplete CameraPanLeft =
+        [JoinName("CameraPanLeft")]
+        public JoinDataComplete CameraPanLeft =
             new JoinDataComplete(new JoinData { JoinNumber = 113, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -90,7 +98,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraPanRight")] public JoinDataComplete CameraPanRight =
+        [JoinName("CameraPanRight")]
+        public JoinDataComplete CameraPanRight =
             new JoinDataComplete(new JoinData { JoinNumber = 114, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -99,7 +108,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraPresetNames")] public JoinDataComplete CameraPresetNames =
+        [JoinName("CameraPresetNames")]
+        public JoinDataComplete CameraPresetNames =
             new JoinDataComplete(new JoinData { JoinNumber = 121, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -108,7 +118,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("CameraPresetSelect")] public JoinDataComplete CameraPresetSelect =
+        [JoinName("CameraPresetSelect")]
+        public JoinDataComplete CameraPresetSelect =
             new JoinDataComplete(new JoinData { JoinNumber = 121, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -117,7 +128,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("CameraPresetSave")] public JoinDataComplete CameraPresetSave =
+        [JoinName("CameraPresetSave")]
+        public JoinDataComplete CameraPresetSave =
             new JoinDataComplete(new JoinData { JoinNumber = 121, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -126,7 +138,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraSelfView")] public JoinDataComplete CameraSelfView =
+        [JoinName("CameraSelfView")]
+        public JoinDataComplete CameraSelfView =
             new JoinDataComplete(new JoinData { JoinNumber = 141, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -135,7 +148,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraSupportsAutoMode")] public JoinDataComplete CameraSupportsAutoMode =
+        [JoinName("CameraSupportsAutoMode")]
+        public JoinDataComplete CameraSupportsAutoMode =
             new JoinDataComplete(new JoinData { JoinNumber = 143, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -144,7 +158,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraSupportsOffMode")] public JoinDataComplete CameraSupportsOffMode =
+        [JoinName("CameraSupportsOffMode")]
+        public JoinDataComplete CameraSupportsOffMode =
             new JoinDataComplete(new JoinData { JoinNumber = 144, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -153,7 +168,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraTiltDown")] public JoinDataComplete CameraTiltDown =
+        [JoinName("CameraTiltDown")]
+        public JoinDataComplete CameraTiltDown =
             new JoinDataComplete(new JoinData { JoinNumber = 112, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -162,7 +178,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraTiltUp")] public JoinDataComplete CameraTiltUp =
+        [JoinName("CameraTiltUp")]
+        public JoinDataComplete CameraTiltUp =
             new JoinDataComplete(new JoinData { JoinNumber = 111, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -171,7 +188,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraZoomIn")] public JoinDataComplete CameraZoomIn =
+        [JoinName("CameraZoomIn")]
+        public JoinDataComplete CameraZoomIn =
             new JoinDataComplete(new JoinData { JoinNumber = 115, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -180,7 +198,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CameraZoomOut")] public JoinDataComplete CameraZoomOut =
+        [JoinName("CameraZoomOut")]
+        public JoinDataComplete CameraZoomOut =
             new JoinDataComplete(new JoinData { JoinNumber = 116, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -189,7 +208,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("CurrentCallName")] public JoinDataComplete CurrentCallData =
+        [JoinName("CurrentCallName")]
+        public JoinDataComplete CurrentCallData =
             new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -198,7 +218,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("CurrentDialString")] public JoinDataComplete CurrentDialString =
+        [JoinName("CurrentDialString")]
+        public JoinDataComplete CurrentDialString =
             new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -207,7 +228,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("CurrentParticipants")] public JoinDataComplete CurrentParticipants =
+        [JoinName("CurrentParticipants")]
+        public JoinDataComplete CurrentParticipants =
             new JoinDataComplete(new JoinData { JoinNumber = 151, JoinSpan = 1 },
             new JoinMetadata()
             {
@@ -216,7 +238,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("CurrentSource")] public JoinDataComplete CurrentSource =
+        [JoinName("CurrentSource")]
+        public JoinDataComplete CurrentSource =
             new JoinDataComplete(new JoinData { JoinNumber = 201, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -225,7 +248,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("DialMeeting1")] public JoinDataComplete DialMeeting1 =
+        [JoinName("DialMeeting1")]
+        public JoinDataComplete DialMeeting1 =
             new JoinDataComplete(new JoinData { JoinNumber = 161, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -254,7 +278,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryDialSelectedLine")] public JoinDataComplete DirectoryDialSelectedLine =
+        [JoinName("DirectoryDialSelectedLine")]
+        public JoinDataComplete DirectoryDialSelectedLine =
             new JoinDataComplete(new JoinData { JoinNumber = 106, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -263,7 +288,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryEntries")] public JoinDataComplete DirectoryEntries =
+        [JoinName("DirectoryEntries")]
+        public JoinDataComplete DirectoryEntries =
             new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -272,7 +298,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("DirectoryEntryIsContact")] public JoinDataComplete DirectoryEntryIsContact =
+        [JoinName("DirectoryEntryIsContact")]
+        public JoinDataComplete DirectoryEntryIsContact =
             new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -281,7 +308,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryEntrySelectedName")] public JoinDataComplete DirectoryEntrySelectedName =
+        [JoinName("DirectoryEntrySelectedName")]
+        public JoinDataComplete DirectoryEntrySelectedName =
             new JoinDataComplete(new JoinData { JoinNumber = 356, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -290,7 +318,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("DirectoryEntrySelectedNumber")] public JoinDataComplete DirectoryEntrySelectedNumber =
+        [JoinName("DirectoryEntrySelectedNumber")]
+        public JoinDataComplete DirectoryEntrySelectedNumber =
             new JoinDataComplete(new JoinData { JoinNumber = 357, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -299,7 +328,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("DirectoryFolderBack")] public JoinDataComplete DirectoryFolderBack =
+        [JoinName("DirectoryFolderBack")]
+        public JoinDataComplete DirectoryFolderBack =
             new JoinDataComplete(new JoinData { JoinNumber = 105, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -308,7 +338,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryHasChanged")] public JoinDataComplete DirectoryHasChanged =
+        [JoinName("DirectoryHasChanged")]
+        public JoinDataComplete DirectoryHasChanged =
             new JoinDataComplete(new JoinData { JoinNumber = 103, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -317,7 +348,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryIsRoot")] public JoinDataComplete DirectoryIsRoot =
+        [JoinName("DirectoryIsRoot")]
+        public JoinDataComplete DirectoryIsRoot =
             new JoinDataComplete(new JoinData { JoinNumber = 102, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -326,7 +358,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryLineSelected")] public JoinDataComplete DirectoryLineSelected =
+        [JoinName("DirectoryLineSelected")]
+        public JoinDataComplete DirectoryLineSelected =
             new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -335,7 +368,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryRoot")] public JoinDataComplete DirectoryRoot =
+        [JoinName("DirectoryRoot")]
+        public JoinDataComplete DirectoryRoot =
             new JoinDataComplete(new JoinData { JoinNumber = 104, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -344,7 +378,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectoryRowCount")] public JoinDataComplete DirectoryRowCount =
+        [JoinName("DirectoryRowCount")]
+        public JoinDataComplete DirectoryRowCount =
             new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -353,7 +388,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("DirectorySearchBusy")] public JoinDataComplete DirectorySearchBusy =
+        [JoinName("DirectorySearchBusy")]
+        public JoinDataComplete DirectorySearchBusy =
             new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -362,7 +398,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("DirectorySearchString")] public JoinDataComplete DirectorySearchString =
+        [JoinName("DirectorySearchString")]
+        public JoinDataComplete DirectorySearchString =
             new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -371,7 +408,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("DirectorySelectRow")] public JoinDataComplete DirectorySelectRow =
+        [JoinName("DirectorySelectRow")]
+        public JoinDataComplete DirectorySelectRow =
             new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -380,7 +418,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("DirectorySelectedFolderName")] public JoinDataComplete DirectorySelectedFolderName =
+        [JoinName("DirectorySelectedFolderName")]
+        public JoinDataComplete DirectorySelectedFolderName =
             new JoinDataComplete(new JoinData { JoinNumber = 358, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -389,7 +428,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("0")] public JoinDataComplete Dtmf0 =
+        [JoinName("0")]
+        public JoinDataComplete Dtmf0 =
             new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -398,7 +438,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("1")] public JoinDataComplete Dtmf1 =
+        [JoinName("1")]
+        public JoinDataComplete Dtmf1 =
             new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -407,7 +448,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("2")] public JoinDataComplete Dtmf2 =
+        [JoinName("2")]
+        public JoinDataComplete Dtmf2 =
             new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -416,7 +458,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("3")] public JoinDataComplete Dtmf3 =
+        [JoinName("3")]
+        public JoinDataComplete Dtmf3 =
             new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -425,7 +468,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("4")] public JoinDataComplete Dtmf4 =
+        [JoinName("4")]
+        public JoinDataComplete Dtmf4 =
             new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -434,7 +478,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("5")] public JoinDataComplete Dtmf5 =
+        [JoinName("5")]
+        public JoinDataComplete Dtmf5 =
             new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -443,7 +488,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("6")] public JoinDataComplete Dtmf6 =
+        [JoinName("6")]
+        public JoinDataComplete Dtmf6 =
             new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -452,7 +498,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("7")] public JoinDataComplete Dtmf7 =
+        [JoinName("7")]
+        public JoinDataComplete Dtmf7 =
             new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -461,7 +508,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("8")] public JoinDataComplete Dtmf8 =
+        [JoinName("8")]
+        public JoinDataComplete Dtmf8 =
             new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -470,7 +518,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("9")] public JoinDataComplete Dtmf9 =
+        [JoinName("9")]
+        public JoinDataComplete Dtmf9 =
             new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -479,7 +528,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("#")] public JoinDataComplete DtmfPound =
+        [JoinName("#")]
+        public JoinDataComplete DtmfPound =
             new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -488,7 +538,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("*")] public JoinDataComplete DtmfStar =
+        [JoinName("*")]
+        public JoinDataComplete DtmfStar =
             new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -497,7 +548,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("EndCall")] public JoinDataComplete EndCall =
+        [JoinName("EndCall")]
+        public JoinDataComplete EndCall =
             new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -506,7 +558,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("HookState")] public JoinDataComplete HookState =
+        [JoinName("HookState")]
+        public JoinDataComplete HookState =
             new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -515,7 +568,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("IncomingAnswer")] public JoinDataComplete IncomingAnswer =
+        [JoinName("IncomingAnswer")]
+        public JoinDataComplete IncomingAnswer =
             new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -524,7 +578,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("IncomingCall")] public JoinDataComplete IncomingCall =
+        [JoinName("IncomingCall")]
+        public JoinDataComplete IncomingCall =
             new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -533,7 +588,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("IncomingCallName")] public JoinDataComplete IncomingCallName =
+        [JoinName("IncomingCallName")]
+        public JoinDataComplete IncomingCallName =
             new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -542,7 +598,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("IncomingCallNumber")] public JoinDataComplete IncomingCallNumber =
+        [JoinName("IncomingCallNumber")]
+        public JoinDataComplete IncomingCallNumber =
             new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -551,7 +608,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("IncomingReject")] public JoinDataComplete IncomingReject =
+        [JoinName("IncomingReject")]
+        public JoinDataComplete IncomingReject =
             new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -561,7 +619,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
             });
 
 
-        [JoinName("ManualDial")] public JoinDataComplete ManualDial =
+        [JoinName("ManualDial")]
+        public JoinDataComplete ManualDial =
             new JoinDataComplete(new JoinData { JoinNumber = 71, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -570,7 +629,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("Meeting Count Fb")] public JoinDataComplete MeetingCount =
+        [JoinName("Meeting Count Fb")]
+        public JoinDataComplete MeetingCount =
             new JoinDataComplete(new JoinData { JoinNumber = 161, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -579,7 +639,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("MicMuteOff")] public JoinDataComplete MicMuteOff =
+        [JoinName("MicMuteOff")]
+        public JoinDataComplete MicMuteOff =
             new JoinDataComplete(new JoinData { JoinNumber = 172, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -588,7 +649,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("MicMuteOn")] public JoinDataComplete MicMuteOn =
+        [JoinName("MicMuteOn")]
+        public JoinDataComplete MicMuteOn =
             new JoinDataComplete(new JoinData { JoinNumber = 171, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -597,7 +659,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("MicMuteToggle")] public JoinDataComplete MicMuteToggle =
+        [JoinName("MicMuteToggle")]
+        public JoinDataComplete MicMuteToggle =
             new JoinDataComplete(new JoinData { JoinNumber = 173, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -606,7 +669,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("MinutesBeforeMeetingStart")] public JoinDataComplete MinutesBeforeMeetingStart =
+        [JoinName("MinutesBeforeMeetingStart")]
+        public JoinDataComplete MinutesBeforeMeetingStart =
             new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -615,7 +679,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("ParticipantCount")] public JoinDataComplete ParticipantCount =
+        [JoinName("ParticipantCount")]
+        public JoinDataComplete ParticipantCount =
             new JoinDataComplete(new JoinData { JoinNumber = 151, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -624,7 +689,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("Schedule")] public JoinDataComplete Schedule =
+        [JoinName("Schedule")]
+        public JoinDataComplete Schedule =
             new JoinDataComplete(new JoinData { JoinNumber = 102, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -633,7 +699,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("AutoShareWhileInCall")] public JoinDataComplete SourceShareAutoStart =
+        [JoinName("AutoShareWhileInCall")]
+        public JoinDataComplete SourceShareAutoStart =
             new JoinDataComplete(new JoinData { JoinNumber = 203, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -642,7 +709,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("SourceShareEnd")] public JoinDataComplete SourceShareEnd =
+        [JoinName("SourceShareEnd")]
+        public JoinDataComplete SourceShareEnd =
             new JoinDataComplete(new JoinData { JoinNumber = 202, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -651,7 +719,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("SourceShareStart")] public JoinDataComplete SourceShareStart =
+        [JoinName("SourceShareStart")]
+        public JoinDataComplete SourceShareStart =
             new JoinDataComplete(new JoinData { JoinNumber = 201, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -660,7 +729,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("RecievingContent")] public JoinDataComplete RecievingContent =
+        [JoinName("RecievingContent")]
+        public JoinDataComplete RecievingContent =
             new JoinDataComplete(new JoinData { JoinNumber = 204, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -669,7 +739,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinCapabilities = eJoinCapabilities.ToSIMPL
             });
 
-        [JoinName("SelfviewPosition")] public JoinDataComplete SelfviewPosition =
+        [JoinName("SelfviewPosition")]
+        public JoinDataComplete SelfviewPosition =
             new JoinDataComplete(new JoinData { JoinNumber = 211, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -688,7 +759,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        [JoinName("SpeedDialStart")] public JoinDataComplete SpeedDialStart =
+        [JoinName("SpeedDialStart")]
+        public JoinDataComplete SpeedDialStart =
             new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 4 },
             new JoinMetadata
             {
@@ -697,7 +769,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("UpdateMeetings")] public JoinDataComplete UpdateMeetings =
+        [JoinName("UpdateMeetings")]
+        public JoinDataComplete UpdateMeetings =
             new JoinDataComplete(new JoinData { JoinNumber = 160, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -706,7 +779,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("VolumeDown")] public JoinDataComplete VolumeDown =
+        [JoinName("VolumeDown")]
+        public JoinDataComplete VolumeDown =
             new JoinDataComplete(new JoinData { JoinNumber = 175, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -715,7 +789,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("VolumeLevel")] public JoinDataComplete VolumeLevel =
+        [JoinName("VolumeLevel")]
+        public JoinDataComplete VolumeLevel =
             new JoinDataComplete(new JoinData { JoinNumber = 174, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -724,7 +799,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("VolumeMuteOff")] public JoinDataComplete VolumeMuteOff =
+        [JoinName("VolumeMuteOff")]
+        public JoinDataComplete VolumeMuteOff =
             new JoinDataComplete(new JoinData { JoinNumber = 177, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -733,7 +809,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("VolumeMuteOn")] public JoinDataComplete VolumeMuteOn =
+        [JoinName("VolumeMuteOn")]
+        public JoinDataComplete VolumeMuteOn =
             new JoinDataComplete(new JoinData { JoinNumber = 176, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -742,7 +819,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("VolumeMuteToggle")] public JoinDataComplete VolumeMuteToggle =
+        [JoinName("VolumeMuteToggle")]
+        public JoinDataComplete VolumeMuteToggle =
             new JoinDataComplete(new JoinData { JoinNumber = 178, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -751,7 +829,8 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Digital
             });
 
-        [JoinName("VolumeUp")] public JoinDataComplete VolumeUp =
+        [JoinName("VolumeUp")]
+        public JoinDataComplete VolumeUp =
             new JoinDataComplete(new JoinData { JoinNumber = 174, JoinSpan = 1 },
             new JoinMetadata
             {
@@ -800,7 +879,26 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
                 JoinType = eJoinType.Serial
             });
 
-        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
+        public VideoCodecControllerJoinMap(uint joinStart)
+            : base(joinStart, typeof(VideoCodecControllerJoinMap))
+        {
+        }
+
+        public VideoCodecControllerJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+        }
+    }
+}
+
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+    [Obsolete("Use PepperDash.Essentials.Core.Bridges.JoinMaps")]
+    public class VideoCodecControllerJoinMap : PepperDash.Essentials.Core.Bridges.JoinMaps.VideoCodecControllerJoinMap
+    {
+
+        public VideoCodecControllerJoinMap(uint joinStart) : this(joinStart, typeof (VideoCodecControllerJoinMap))
         {
         }
 

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

@@ -1,4 +1,6 @@
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+using System;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface IHasBranding
     {
@@ -6,3 +8,12 @@
         void InitializeBranding(string roomKey);
     }
 }
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface IHasBranding:PepperDash.Essentials.Core.DeviceTypeInterfaces.IHasBranding
+    {
+
+    }
+}

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

@@ -1,6 +1,6 @@
-using PepperDash.Essentials.Core;
+using System;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     public interface IHasPhoneDialing
     {
@@ -12,3 +12,11 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         void SendDtmfToPhone(string digit);
     }
 }
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface IHasPhoneDialing:PepperDash.Essentials.Core.DeviceTypeInterfaces.IHasPhoneDialing
+    {
+    }
+}

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
     {
@@ -16,3 +16,11 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         List<LanguageLabel> RoomNames { get; set; } 
     }
 }
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface ILanguageDefinition:PepperDash.Essentials.Core.DeviceTypeInterfaces.ILanguageDefinition
+    {
+    }
+}

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

@@ -1,8 +1,8 @@
 using System;
-using System.Collections.Generic;
 
-namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
+   
     public interface ILanguageProvider
     {
         ILanguageDefinition CurrentLanguage { get; set; }
@@ -11,3 +11,12 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
     }
 
 }
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public interface ILanguageProvider:PepperDash.Essentials.Core.DeviceTypeInterfaces.ILanguageProvider
+    {
+    }
+
+}

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
     {
@@ -10,3 +11,11 @@ namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
         public uint JoinNumber { get; set; }
     }
 }
+
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    [Obsolete("Use PepperDash.Essentials.Core.DeviceTypeInterfaces")]
+    public class LanguageLabel: PepperDash.Essentials.Core.DeviceTypeInterfaces.LanguageLabel
+    {
+    }
+}

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/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
     {
@@ -22,3 +23,19 @@ namespace PepperDash_Essentials_Core
         bool IsReady { get; }
     }
 }
+
+namespace PepperDash_Essentials_Core
+{
+    [Obsolete("Use PepperDash.Essentials.Core")]
+    public class IsReadyEventArgs : PepperDash.Essentials.Core.IsReadyEventArgs
+    {
+        public IsReadyEventArgs(bool data) : base(data)
+        {
+        }
+    }
+
+    [Obsolete("Use PepperDash.Essentials.Core")]
+    public interface IHasReady: PepperDash.Essentials.Core.IHasReady
+    {
+    }
+}

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/PartitionSensor/GlsPartitionSensorController.cs

@@ -4,7 +4,7 @@ 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;

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
@@ -71,3 +71,31 @@ namespace PepperDash_Essentials_Core.Queues
         }
     }
 }
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// IBasicCommunication Message for IQueue
+    /// </summary>
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public class ComsMessage : PepperDash.Essentials.Core.Queues.ComsMessage
+    {
+        /// <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):base(coms, 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):base(coms, message)
+        {
+        }
+    }
+}

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
@@ -126,7 +126,9 @@ namespace PepperDash_Essentials_Core.Queues
         /// </summary>
         /// <param name="key">Key</param>
         /// <param name="priority"></param>
-        private GenericQueue(string key, Thread.eThreadPriority priority, int capacity, int pacing)
+        /// <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
@@ -245,3 +247,105 @@ namespace PepperDash_Essentials_Core.Queues
         }
     }
 }
+
+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 : PepperDash.Essentials.Core.Queues.GenericQueue
+    {
+        private bool _delayEnabled;
+        private int _delayTime;
+
+        private const Thread.eThreadPriority _defaultPriority = Thread.eThreadPriority.MediumPriority;
+
+        
+
+        /// <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>
+        private GenericQueue(string key, Thread.eThreadPriority priority, int capacity, int pacing):base(key, priority, capacity, pacing)
+        {
+        }
+    }
+}

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

@@ -5,7 +5,7 @@ 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 
     {
@@ -13,3 +13,11 @@ namespace PepperDash_Essentials_Core.Queues
         bool Disposed { get; }
     }
 }
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public interface IQueue<T> : PepperDash.Essentials.Core.Queues.IQueue<T> where T: class 
+    {
+    }
+}

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

@@ -1,7 +1,17 @@
-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:PepperDash.Essentials.Core.Queues.IQueueMessage
+    {
+    }
+}

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
@@ -42,3 +42,20 @@ namespace PepperDash_Essentials_Core.Queues
         }
     }
 }
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    /// <summary>
+    /// Message class for processing strings via an IQueue
+    /// </summary>
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public class ProcessStringMessage : PepperDash.Essentials.Core.Queues.ProcessStringMessage
+    {
+        /// <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) : base(message, action){}
+    }
+}

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
     {
@@ -104,3 +104,107 @@ namespace PepperDash_Essentials_Core.Queues
         }
     }
 }
+
+namespace PepperDash_Essentials_Core.Queues
+{
+    [Obsolete("Use PepperDash.Essentials.Core.Queues")]
+    public sealed class StringResponseProcessor : IKeyed, IDisposable
+    {
+        private readonly Action<string> _processStringAction;
+        private readonly PepperDash.Essentials.Core.Queues.IQueue<PepperDash.Essentials.Core.Queues.IQueueMessage> _queue;
+        private readonly IBasicCommunication _coms;
+        private readonly CommunicationGather _gather;
+
+        private StringResponseProcessor(string key, Action<string> processStringAction)
+        {
+            _processStringAction = processStringAction;
+            _queue = new PepperDash.Essentials.Core.Queues.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 Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -18,8 +18,7 @@ using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash_Essentials_Core.Queues;
+using PepperDash.Essentials.Core.Queues;
-using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -19,8 +19,7 @@ using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
-using PepperDash_Essentials_Core.Bridges.JoinMaps;
+using PepperDash.Essentials.Core.Bridges.JoinMaps;
-using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 using Feedback = PepperDash.Essentials.Core.Feedback;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -17,7 +17,6 @@ using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
-using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {