fix for EiscApiAdvanced loading

Add VirtualControlEiscClient

PepperDashEssentials/ControlSystem.cs

@@ -327,7 +327,11 @@ namespace PepperDash.Essentials
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
 
             // Add global System Monitor device
-            DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+            if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)
+            {
+                DeviceManager.AddDevice(
+                    new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
+            }
 
             foreach (var devConf in ConfigReader.ConfigObject.Devices)
             {

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -13,6 +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;
 
 namespace PepperDash.Essentials
 {
@@ -313,7 +314,7 @@ namespace PepperDash.Essentials
 
 
                 VideoCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
-				VideoCodec.IsReadyChange += (o, a) => this.SetCodecExternalSources(); 
+				VideoCodec.IsReadyChange += (o, a) => { this.SetCodecExternalSources(); SetCodecBranding(); }; 
 
                 if (AudioCodec != null)
                     AudioCodec.CallStatusChange += (o, a) => this.InCallFeedback.FireUpdate();
@@ -703,29 +704,36 @@ namespace PepperDash.Essentials
 			{
 				return;
 			}
-			else
-			{
-				string codecTieLine = "";
-				codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
-				videoCodecWithExternalSwitching.ClearExternalSources();
-				videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
-				var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
-				foreach (var kvp in srcList)
-				{
-					var srcConfig = kvp.Value;
+		    string codecTieLine = ConfigReader.ConfigObject.TieLines.SingleOrDefault(x => x.DestinationKey == VideoCodec.Key).DestinationPort;
+		    videoCodecWithExternalSwitching.ClearExternalSources();
+		    videoCodecWithExternalSwitching.RunRouteAction = RunRouteAction;
+		    var srcList = ConfigReader.ConfigObject.SourceLists.SingleOrDefault(x => x.Key == SourceListKey).Value.OrderBy(kv => kv.Value.Order); ;
 
-					if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
-					{
+		    foreach (var kvp in srcList)
+		    {
+		        var srcConfig = kvp.Value;
 
-						videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
-						videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
+		        if (kvp.Key != DefaultCodecRouteString && kvp.Key != "roomOff")
+		        {
+
+		            videoCodecWithExternalSwitching.AddExternalSource(codecTieLine, kvp.Key, srcConfig.PreferredName, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceType.desktop);
+		            videoCodecWithExternalSwitching.SetExternalSourceState(kvp.Key, PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.eExternalSourceMode.Ready);
 
 
-					}
-				}
-			}
+		        }
+		    }
 		}
+
+        private void SetCodecBranding()
+        {
+            var vcWithBranding = VideoCodec as IHasBranding;
+
+            if (vcWithBranding == null) return;
+
+            Debug.Console(1, this, "Setting Codec Branding");
+            vcWithBranding.InitializeBranding(Key);
+        }
 		
         #region IPrivacy Members
 

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

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
 
 using Newtonsoft.Json;
@@ -82,9 +84,9 @@ namespace PepperDash.Essentials.Core.Bridges
 
         protected Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
 
-        public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
+        public BasicTriList Eisc { get; private set; }
 
-        public EiscApiAdvanced(DeviceConfig dc) :
+        public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
             base(dc.Key)
         {
             JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
@@ -92,44 +94,52 @@ namespace PepperDash.Essentials.Core.Bridges
             PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
             //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
-            Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
+            Eisc = eisc;
 
             Eisc.SigChange += Eisc_SigChange;
 
-            AddPostActivationAction( () =>
+            AddPostActivationAction(LinkDevices);
+        }
+
+        private void LinkDevices()
+        {
+            Debug.Console(1, this, "Linking Devices...");
+
+            foreach (var d in PropertiesConfig.Devices)
             {
-                Debug.Console(1, this, "Linking Devices...");
+                var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
 
-                foreach (var d in PropertiesConfig.Devices)
+                if (device == null)
                 {
-                    var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                    if (device == null) continue;
-
-                    Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
-
-                    if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
-                    {
-                        Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
-                            "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                            device.Key);
-                        continue;
-                    }
-
-                    var bridge = device as IBridgeAdvanced;
-                    if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                    continue;
                 }
 
-                var registerResult = Eisc.Register();
+                Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
 
-                if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+                if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                 {
-                    Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
-                    return;
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
+                    continue;
                 }
 
-                Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
-            });
+                var bridge = device as IBridgeAdvanced;
+                if (bridge != null)
+                {
+                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                }
+            }
+
+            var registerResult = Eisc.Register();
+
+            if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+            {
+                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Registration result: {0}", registerResult);
+                return;
+            }
+
+            Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "EISC registration successful");
         }
 
         /// <summary>
@@ -152,7 +162,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// <summary>
         /// Prints all the join maps on this bridge
         /// </summary>
-        public void PrintJoinMaps()
+        public virtual void PrintJoinMaps()
         {
             Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
 
@@ -247,7 +257,7 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         /// <param name="currentDevice"></param>
         /// <param name="args"></param>
-        void Eisc_SigChange(object currentDevice, SigEventArgs args)
+        protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
         {
             try
             {
@@ -299,15 +309,34 @@ namespace PepperDash.Essentials.Core.Bridges
     {
         public EiscApiAdvancedFactory()
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced" };
+            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "vceiscapiadv", "vceiscapiadvanced" };
         }
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new EiscApiAdvanced Device");
 
-            return new EiscApiAdvanced(dc);
-            
+            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
+
+            switch (dc.Type.ToLower())
+            {
+                case "eiscapiadv":
+                case "eiscapiadvanced":
+                {
+                    var eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                case "vceiscapiadv":
+                case "vceiscapiadvanced":
+                {
+                    var eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, InitialParametersClass.RoomId,
+                        Global.ControlSystem);
+                    return new EiscApiAdvanced(dc, eisc);
+                }
+                default:
+                    return null;
+            }
         }
     }
 

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

@@ -0,0 +1,721 @@
+using System;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash_Essentials_Core.Bridges.JoinMaps
+{
+    public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced
+    {
+        #region Status
+
+        [JoinName("IsOnline")] public JoinDataComplete IsOnline =
+            new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Device is Online",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        #endregion
+
+        [JoinName("CallDirection")] public JoinDataComplete CallDirection =
+            new JoinDataComplete(new JoinData {JoinNumber = 22, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Call Direction",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("CameraLayout")] public JoinDataComplete CameraLayout =
+            new JoinDataComplete(new JoinData {JoinNumber = 142, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Layout Toggle",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraModeAuto")] public JoinDataComplete CameraModeAuto =
+            new JoinDataComplete(new JoinData {JoinNumber = 131, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Mode Auto",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraModeManual")] public JoinDataComplete CameraModeManual =
+            new JoinDataComplete(new JoinData {JoinNumber = 132, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Mode Manual",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraModeOff")] public JoinDataComplete CameraModeOff =
+            new JoinDataComplete(new JoinData {JoinNumber = 133, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Mode Off",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraNumberSelect")] public JoinDataComplete CameraNumberSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 60, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Number Select/FB",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("CameraPanLeft")] public JoinDataComplete CameraPanLeft =
+            new JoinDataComplete(new JoinData {JoinNumber = 113, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Pan Left",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraPanRight")] public JoinDataComplete CameraPanRight =
+            new JoinDataComplete(new JoinData {JoinNumber = 114, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Pan Right",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraPresetSelect")] public JoinDataComplete CameraPresetSelect =
+            new JoinDataComplete(new JoinData {JoinNumber = 121, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Preset Select",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("CameraPresetNames")] public JoinDataComplete CameraPresetNames =
+            new JoinDataComplete(new JoinData {JoinNumber = 121, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Preset Names - XSIG, max of 15",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("CameraSelfView")] public JoinDataComplete CameraSelfView =
+            new JoinDataComplete(new JoinData {JoinNumber = 141, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Self View Toggle/FB",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraSupportsAutoMode")] public JoinDataComplete CameraSupportsAutoMode =
+            new JoinDataComplete(new JoinData {JoinNumber = 143, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Supports Auto Mode FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraSupportsOffMode")] public JoinDataComplete CameraSupportsOffMode =
+            new JoinDataComplete(new JoinData {JoinNumber = 144, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Supports Off Mode FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraTiltDown")] public JoinDataComplete CameraTiltDown =
+            new JoinDataComplete(new JoinData {JoinNumber = 112, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Tilt Down",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraTiltUp")] public JoinDataComplete CameraTiltUp =
+            new JoinDataComplete(new JoinData {JoinNumber = 111, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Tilt Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraZoomIn")] public JoinDataComplete CameraZoomIn =
+            new JoinDataComplete(new JoinData {JoinNumber = 115, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Zoom In",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CameraZoomOut")] public JoinDataComplete CameraZoomOut =
+            new JoinDataComplete(new JoinData {JoinNumber = 116, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Camera Zoom Out",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CurrentCallName")] public JoinDataComplete CurrentCallData =
+            new JoinDataComplete(new JoinData {JoinNumber = 2, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Call Data - XSIG",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("CurrentDialString")] public JoinDataComplete CurrentDialString =
+            new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Dial String",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryHasChanged")] public JoinDataComplete DirectoryHasChanged =
+            new JoinDataComplete(new JoinData {JoinNumber = 103, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory has changed FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryDialSelectedLine")] public JoinDataComplete DirectoryDialSelectedLine =
+            new JoinDataComplete(new JoinData {JoinNumber = 106, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Dial selected directory line",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryEntries")] public JoinDataComplete DirectoryEntries =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Entries - XSig, 255 entries",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryEntryIsContact")] public JoinDataComplete DirectoryEntryIsContact =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Selected Entry Is Contact FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryEntrySelectedName")] public JoinDataComplete DirectoryEntrySelectedName =
+            new JoinDataComplete(new JoinData {JoinNumber = 356, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Selected Directory Entry Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryEntrySelectedNumber")] public JoinDataComplete DirectoryEntrySelectedNumber =
+            new JoinDataComplete(new JoinData {JoinNumber = 357, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Selected Directory Entry Number",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectoryFolderBack")] public JoinDataComplete DirectoryFolderBack =
+            new JoinDataComplete(new JoinData {JoinNumber = 105, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Go back one directory level",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryIsRoot")] public JoinDataComplete DirectoryIsRoot =
+            new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory is on Root FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryLineSelected")] public JoinDataComplete DirectoryLineSelected =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Line Selected FB",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryRoot")] public JoinDataComplete DirectoryRoot =
+            new JoinDataComplete(new JoinData {JoinNumber = 104, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Go to Directory Root",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectoryRowCount")] public JoinDataComplete DirectoryRowCount =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Row Count FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("DirectorySearchBusy")] public JoinDataComplete DirectorySearchBusy =
+            new JoinDataComplete(new JoinData {JoinNumber = 100, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Search Busy FB",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("DirectorySearchString")] public JoinDataComplete DirectorySearchString =
+            new JoinDataComplete(new JoinData {JoinNumber = 100, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Search String",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DirectorySelectRow")] public JoinDataComplete DirectorySelectRow =
+            new JoinDataComplete(new JoinData {JoinNumber = 101, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Directory Select Row",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        [JoinName("DirectorySelectedFolderName")] public JoinDataComplete DirectorySelectedFolderName =
+            new JoinDataComplete(new JoinData {JoinNumber = 358, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Selected Directory Folder Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("0")] public JoinDataComplete Dtmf0 =
+            new JoinDataComplete(new JoinData {JoinNumber = 20, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 0",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("1")] public JoinDataComplete Dtmf1 =
+            new JoinDataComplete(new JoinData {JoinNumber = 11, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 1",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("2")] public JoinDataComplete Dtmf2 =
+            new JoinDataComplete(new JoinData {JoinNumber = 12, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 2",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("3")] public JoinDataComplete Dtmf3 =
+            new JoinDataComplete(new JoinData {JoinNumber = 13, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 3",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("4")] public JoinDataComplete Dtmf4 =
+            new JoinDataComplete(new JoinData {JoinNumber = 14, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 4",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("5")] public JoinDataComplete Dtmf5 =
+            new JoinDataComplete(new JoinData {JoinNumber = 15, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 5",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("6")] public JoinDataComplete Dtmf6 =
+            new JoinDataComplete(new JoinData {JoinNumber = 16, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 6",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("7")] public JoinDataComplete Dtmf7 =
+            new JoinDataComplete(new JoinData {JoinNumber = 17, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 7",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("8")] public JoinDataComplete Dtmf8 =
+            new JoinDataComplete(new JoinData {JoinNumber = 18, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 8",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("9")] public JoinDataComplete Dtmf9 =
+            new JoinDataComplete(new JoinData {JoinNumber = 19, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF 9",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("#")] public JoinDataComplete DtmfPound =
+            new JoinDataComplete(new JoinData {JoinNumber = 22, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF #",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("*")] public JoinDataComplete DtmfStar =
+            new JoinDataComplete(new JoinData {JoinNumber = 21, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "DTMF *",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("EndCall")] public JoinDataComplete EndCall =
+            new JoinDataComplete(new JoinData {JoinNumber = 24, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Hang Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("HookState")] public JoinDataComplete HookState =
+            new JoinDataComplete(new JoinData {JoinNumber = 31, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Current Hook State",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingAnswer")] public JoinDataComplete IncomingAnswer =
+            new JoinDataComplete(new JoinData {JoinNumber = 51, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Answer Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingCall")] public JoinDataComplete IncomingCall =
+            new JoinDataComplete(new JoinData {JoinNumber = 50, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("IncomingCallName")] public JoinDataComplete IncomingCallName =
+            new JoinDataComplete(new JoinData {JoinNumber = 51, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Name",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingCallNumber")] public JoinDataComplete IncomingCallNumber =
+            new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Incoming Call Number",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("IncomingReject")] public JoinDataComplete IncomingReject =
+            new JoinDataComplete(new JoinData {JoinNumber = 52, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Reject Incoming Call",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("SpeedDialStart")] public JoinDataComplete SpeedDialStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 4},
+                new JoinMetadata
+                {
+                    Description = "Speed Dial",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("Schedule")] public JoinDataComplete Schedule =
+            new JoinDataComplete(new JoinData {JoinNumber = 102, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Schedule Data - XSIG",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("DialMeeting")] public JoinDataComplete DialMeeting = new JoinDataComplete(new JoinData{JoinNumber=161, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Join first joinable meeting",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("UpdateMeetings")] public JoinDataComplete UpdateMeetings =
+            new JoinDataComplete(new JoinData {JoinNumber = 162, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Update Meetings",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("Meeting Count Fb")] public JoinDataComplete MeetingCount =
+            new JoinDataComplete(new JoinData {JoinNumber = 161, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Meeting Count",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+
+        [JoinName("CameraLayoutStringFb")]
+        public JoinDataComplete CameraLayoutStringFb =
+            new JoinDataComplete(new JoinData { JoinNumber = 141, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Current Layout Fb",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        
+        
+
+        [JoinName("ManualDial")] public JoinDataComplete ManualDial =
+            new JoinDataComplete(new JoinData {JoinNumber = 71, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Dial manual string",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("SourceShareStart")] public JoinDataComplete SourceShareStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 201, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Start Sharing & Feedback",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("SourceShareEnd")]
+        public JoinDataComplete SourceShareEnd =
+            new JoinDataComplete(new JoinData { JoinNumber = 202, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Stop Sharing & Feedback",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("AutoShareWhileInCall")] public JoinDataComplete SourceShareAutoStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 203, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "When high, will autostart sharing when a call is joined",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("CurrentSource")] public JoinDataComplete CurrentSource = new JoinDataComplete(new JoinData{JoinNumber = 201, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Current Source",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+        [JoinName("CurrentParticipants")] public JoinDataComplete CurrentParticipants =
+            new JoinDataComplete(new JoinData{JoinNumber = 151, JoinSpan = 1},
+                new JoinMetadata()
+                {
+                    Description = "Current Participants XSig",
+                    JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                    JoinType = eJoinType.Serial
+                });
+
+        [JoinName("ParticipantCount")] public JoinDataComplete ParticipantCount = new JoinDataComplete(new JoinData{JoinNumber = 151, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Current Participant Count",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        [JoinName("MicMuteOn")] public JoinDataComplete MicMuteOn =
+            new JoinDataComplete(new JoinData {JoinNumber = 171, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Mic Mute On",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("MicMuteOff")] public JoinDataComplete MicMuteOff =
+            new JoinDataComplete(new JoinData {JoinNumber = 172, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Mic Mute Off",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("MicMuteToggle")] public JoinDataComplete MicMuteToggle =
+            new JoinDataComplete(new JoinData {JoinNumber = 173, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Mic Mute Toggle",
+                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("VolumeMuteOn")]
+        public JoinDataComplete VolumeMuteOn =
+            new JoinDataComplete(new JoinData { JoinNumber = 176, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Volume Mute On",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("VolumeMuteOff")]
+        public JoinDataComplete VolumeMuteOff =
+            new JoinDataComplete(new JoinData { JoinNumber = 177, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Volume Mute Off",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("VolumeMuteToggle")]
+        public JoinDataComplete VolumeMuteToggle =
+            new JoinDataComplete(new JoinData { JoinNumber = 178, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Volume Mute Toggle",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("VolumeUp")] public JoinDataComplete VolumeUp =
+            new JoinDataComplete(new JoinData {JoinNumber = 174, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Volume Up",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Digital
+                });
+
+        [JoinName("VolumeDown")]
+        public JoinDataComplete VolumeDown =
+            new JoinDataComplete(new JoinData { JoinNumber = 175, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Volume Down",
+                JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                JoinType = eJoinType.Digital
+            });
+
+        [JoinName("VolumeLevel")]
+        public JoinDataComplete VolumeLevel =
+            new JoinDataComplete(new JoinData { JoinNumber = 174, JoinSpan = 1 },
+            new JoinMetadata
+            {
+                Description = "Volume Level",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Analog
+            });
+
+        [JoinName("MinutesBeforeMeetingStart")] public JoinDataComplete MinutesBeforeMeetingStart =
+            new JoinDataComplete(new JoinData {JoinNumber = 41, JoinSpan = 1},
+                new JoinMetadata
+                {
+                    Description = "Minutes before meeting start that a meeting is joinable",
+                    JoinCapabilities = eJoinCapabilities.FromSIMPL,
+                    JoinType = eJoinType.Analog
+                });
+
+        public VideoCodecControllerJoinMap(uint joinStart) : base(joinStart, typeof (VideoCodecControllerJoinMap))
+        {
+        }
+
+        public VideoCodecControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+        {
+        }
+    }
+}

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

@@ -1,120 +1,120 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class CommFactory
-	{
-		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
-		{
-			try
-			{
-				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
-					(deviceConfig.Properties["control"].ToString());
-				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
-			}
-			catch (Exception e)
-			{
-
-				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
-				return null;
-			}
-		}
-
-
-		/// <summary>
-		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
-		/// </summary>
-		/// <param name="deviceConfig">The Device config object</param>
-		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
-		{
-			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
-			if (controlConfig == null)
-				return null;
-
-			IBasicCommunication comm = null;
-			try
-			{
-				var c = controlConfig.TcpSshProperties;
-				switch (controlConfig.Method)
-				{
-					case eControlMethod.Com:
-						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig);
-						break;
-                    case eControlMethod.Cec:
-                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
-                        break;
-					case eControlMethod.IR:
-						break;
-                    case eControlMethod.Ssh:
-                        {
-                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
-                            ssh.AutoReconnect = c.AutoReconnect;
-                            if(ssh.AutoReconnect)
-                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = ssh;
-                            break;
-                        }
-                    case eControlMethod.Tcpip:
-                        {
-                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
-                            tcp.AutoReconnect = c.AutoReconnect;
-                            if (tcp.AutoReconnect)
-                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
-                            comm = tcp;
-                            break;
-                        }
-                    case eControlMethod.Udp:
-                        {
-                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-                            comm = udp;
-                            break;
-                        }
-					case eControlMethod.Telnet:
-						break;
-					default:
-						break;
-				}				
-			}
-			catch (Exception e)
-			{
-				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
-					deviceConfig.Properties.ToString(), e);
-			}
-
-			// put it in the device manager if it's the right flavor
-			var comDev = comm as Device;
-			if (comDev != null)
-				DeviceManager.AddDevice(comDev);
-			return comm;
-		}
-
-		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
-		{
-			var comPar = config.ComParams;
-			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);
-			return null;
-		}
-
-        /// <summary>
-        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-        /// </summary>
-        /// <param name="config"></param>
-        /// <returns></returns>
-        public static ICec GetCecPort(ControlPropertiesConfig config)
-        {
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class CommFactory
+	{
+		public static EssentialsControlPropertiesConfig GetControlPropertiesConfig(DeviceConfig deviceConfig)
+		{
+			try
+			{
+				return JsonConvert.DeserializeObject<EssentialsControlPropertiesConfig>
+					(deviceConfig.Properties["control"].ToString());
+				//Debug.Console(2, "Control TEST: {0}", JsonConvert.SerializeObject(controlConfig));
+			}
+			catch (Exception e)
+			{
+
+				Debug.Console(0, "ERROR: [{0}] Control properties deserialize failed:\r{1}", deviceConfig.Key, e);
+				return null;
+			}
+		}
+
+
+		/// <summary>
+		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
+		/// </summary>
+		/// <param name="deviceConfig">The Device config object</param>
+		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
+		{
+			EssentialsControlPropertiesConfig controlConfig = GetControlPropertiesConfig(deviceConfig);
+			if (controlConfig == null)
+				return null;
+
+			IBasicCommunication comm = null;
+			try
+			{
+				var c = controlConfig.TcpSshProperties;
+				switch (controlConfig.Method)
+				{
+					case eControlMethod.Com:
+						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig);
+						break;
+                    case eControlMethod.Cec:
+                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig);
+                        break;
+					case eControlMethod.IR:
+						break;
+                    case eControlMethod.Ssh:
+                        {
+                            var ssh = new GenericSshClient(deviceConfig.Key + "-ssh", c.Address, c.Port, c.Username, c.Password);
+                            ssh.AutoReconnect = c.AutoReconnect;
+                            if(ssh.AutoReconnect)
+                                ssh.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = ssh;
+                            break;
+                        }
+                    case eControlMethod.Tcpip:
+                        {
+                            var tcp = new GenericTcpIpClient(deviceConfig.Key + "-tcp", c.Address, c.Port, c.BufferSize);
+                            tcp.AutoReconnect = c.AutoReconnect;
+                            if (tcp.AutoReconnect)
+                                tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
+                            comm = tcp;
+                            break;
+                        }
+                    case eControlMethod.Udp:
+                        {
+                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
+                            comm = udp;
+                            break;
+                        }
+					case eControlMethod.Telnet:
+						break;
+					default:
+						break;
+				}				
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, "Cannot create communication from JSON:\r{0}\r\rException:\r{1}",
+					deviceConfig.Properties.ToString(), e);
+			}
+
+			// put it in the device manager if it's the right flavor
+			var comDev = comm as Device;
+			if (comDev != null)
+				DeviceManager.AddDevice(comDev);
+			return comm;
+		}
+
+		public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
+		{
+			var comPar = config.ComParams;
+			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);
+			return null;
+		}
+
+        /// <summary>
+        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        public static ICec GetCecPort(ControlPropertiesConfig config)
+        {
             var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
 
             if (dev != null)
@@ -147,64 +147,64 @@ namespace PepperDash.Essentials.Core
                     Debug.Console(0, "GetCecPort: '{0}' - Configuration missing 'ControlPortName'", config.ControlPortDevKey);
                 }
             }
-            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
-
-            return null;
-        }
-
-		/// <summary>
-		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
-		/// return the ControlSystem object from the Global class.
-		/// </summary>
-		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
-		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
-		{
-			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
-				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
-				&& Global.ControlSystem is IComPorts)
-				return Global.ControlSystem;
-			else
-			{
-				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
-				if (dev == null)
-					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
-				return dev;
-			}
-		}
-	}
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class EssentialsControlPropertiesConfig : 
-        PepperDash.Core.ControlPropertiesConfig
-    {
-
-        [JsonConverter(typeof(ComSpecJsonConverter))]
-        public ComPort.ComPortSpec ComParams { get; set; }
-
-		public string CresnetId { get; set; }
-
-        /// <summary>
-        /// Attempts to provide uint conversion of string CresnetId
-        /// </summary>
-        public uint CresnetIdInt
-        {
-            get
-            {
-                try 
-                {
-                    return Convert.ToUInt32(CresnetId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-                }
-            }
+            Debug.Console(0, "GetCecPort: Device '{0}' is not a valid device.", config.ControlPortDevKey);
+
+            return null;
         }
 
-        public string InfinetId { get; set; }
-
+		/// <summary>
+		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
+		/// return the ControlSystem object from the Global class.
+		/// </summary>
+		/// <returns>IComPorts device or null if the device is not found or does not implement IComPorts</returns>
+		public static IComPorts GetIComPortsDeviceFromManagedDevice(string ComPortDevKey)
+		{
+			if ((ComPortDevKey.Equals("controlSystem", System.StringComparison.OrdinalIgnoreCase)
+				|| ComPortDevKey.Equals("processor", System.StringComparison.OrdinalIgnoreCase))
+				&& Global.ControlSystem is IComPorts)
+				return Global.ControlSystem;
+			else
+			{
+				var dev = DeviceManager.GetDeviceForKey(ComPortDevKey) as IComPorts;
+				if (dev == null)
+					Debug.Console(0, "ComPortConfig: Cannot find com port device '{0}'", ComPortDevKey);
+				return dev;
+			}
+		}
+	}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsControlPropertiesConfig : 
+        PepperDash.Core.ControlPropertiesConfig
+    {
+
+        [JsonConverter(typeof(ComSpecJsonConverter))]
+        public ComPort.ComPortSpec ComParams { get; set; }
+
+		public string CresnetId { get; set; }
+
+        /// <summary>
+        /// Attempts to provide uint conversion of string CresnetId
+        /// </summary>
+        public uint CresnetIdInt
+        {
+            get
+            {
+                try 
+                {
+                    return Convert.ToUInt32(CresnetId, 16);
+                }
+                catch (Exception)
+                {
+                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
+                }
+            }
+        }
+
+        public string InfinetId { get; set; }
+
         /// <summary>
         /// Attepmts to provide uiont conversion of string InifinetId
         /// </summary>
@@ -221,13 +221,13 @@ namespace PepperDash.Essentials.Core
                     throw new FormatException(string.Format("ERROR:Unable to conver Infinet ID: {0} to hex.  Error:\n{1}", InfinetId));
                 }
             }
-        }
-    }
-
-    public class IrControlSpec
-    {
-        public string PortDeviceKey { get; set; }
-        public uint PortNumber { get; set; }
-        public string File { get; set; }
-    }
+        }
+    }
+
+    public class IrControlSpec
+    {
+        public string PortDeviceKey { get; set; }
+        public uint PortNumber { get; set; }
+        public string File { get; set; }
+    }
 }

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

@@ -1,5 +1,6 @@
 using System;
-using System.Linq;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
@@ -12,8 +13,14 @@ namespace PepperDash.Essentials.Core.Config
 	/// <summary>
 	/// Loads the ConfigObject from the file
 	/// </summary>
-	public class ConfigReader
-	{
+	public class ConfigReader
+	{
+	    public const string LocalConfigPresent =
+            @"
+***************************************************
+************* Using Local config file *************
+***************************************************";
+
 		public static EssentialsConfig ConfigObject { get; private set; }
 
 		public static bool LoadConfig2()
@@ -40,10 +47,10 @@ namespace PepperDash.Essentials.Core.Config
                             "****Error: Multiple Local Configuration files present. Please ensure only a single file exists and reset program.****");
                         return false;
                     }
-                    else if(configFiles.Length == 1)
+                    if(configFiles.Length == 1)
                     {
-                        localConfigFound = true;
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
+                        localConfigFound = true;
+                        
                     }
                 }
                 else
@@ -91,7 +98,13 @@ namespace PepperDash.Essentials.Core.Config
                 }
 
                 // Get the actual file path
-                filePath = configFiles[0].FullName;
+                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))
@@ -177,7 +190,65 @@ namespace PepperDash.Essentials.Core.Config
         {
             var dev = ConfigObject.Devices.FirstOrDefault(d => d.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
             return dev == null ? null : dev.Group;
-        }
+        }
+
+	    private static void GetLocalFileMessage(string filePath)
+	    {
+            var filePathLength = filePath.Length + 2;
+            var debugStringWidth = filePathLength + 12;
+
+            if (debugStringWidth < 51)
+            {
+                debugStringWidth = 51;
+            }
+            var qualifier = (filePathLength % 2 != 0)
+                ? " Using Local Config File "
+                : " Using Local  Config File ";
+            var bookend1 = (debugStringWidth - qualifier.Length) / 2;
+            var bookend2 = (debugStringWidth - filePathLength) / 2;
+
+
+	        var newDebugString = new StringBuilder()
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 1
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 2
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 3
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', debugStringWidth - 4))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 4
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', bookend1 - 2))
+	            .Append(qualifier)
+	            .Append(new string(' ', bookend1 - 2))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 5
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', bookend2 - 2))
+	            .Append(" " + filePath + " ")
+	            .Append(new string(' ', bookend2 - 2))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 6
+	            .Append(new string('*', 2))
+	            .Append(new string(' ', debugStringWidth - 4))
+	            .Append(new string('*', 2))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 7
+	            .Append(new string('*', debugStringWidth))
+	            .Append(CrestronEnvironment.NewLine)
+                // Line 8
+	            .Append(new string('*', debugStringWidth));
+
+            Debug.Console(2, Debug.ErrorLogLevel.Notice, "Found Local config file: '{0}'", filePath);
+            Debug.Console(0, newDebugString.ToString());
+	    }
 
 	}
 }

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

@@ -1,5 +1,5 @@
 using System;
-
+using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Crestron.SimplSharp.Reflection;
 
@@ -81,7 +81,7 @@ namespace PepperDash.Essentials.Core.Config
         //    }
         //} 
 
-        /// <summary>
+        /// <summary>, 
         /// The OS Version of the processor (Firmware Version)
         /// </summary>
         [JsonProperty("osVersion")]
@@ -92,5 +92,18 @@ namespace PepperDash.Essentials.Core.Config
 		//        return Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware;
 		//    }
 		//} 
+
+        /// <summary>
+        /// The information gathered by the processor at runtime about it's NICs and their IP addresses.   
+        /// </summary>
+        [JsonProperty("ipInfo")]
+        public Dictionary<short, EthernetAdapterInfo> IpInfo
+        {
+            get
+            {
+                return Global.EthernetAdapterInfoCollection;
+            }
+        }
     }
+
 }

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

@@ -0,0 +1,8 @@
+namespace PepperDash_Essentials_Core.DeviceTypeInterfaces
+{
+    public interface IHasBranding
+    {
+        bool BrandingEnabled { get; }
+        void InitializeBranding(string roomKey);
+    }
+}

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

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+    public class EthernetAdapterInfo
+    {
+        public EthernetAdapterType Type { get; set; }
+        public bool DhcpIsOn { get; set; }
+        public string Hostname { get; set; }
+        public string MacAddress { get; set; }
+        public string IpAddress { get; set; }
+        public string Subnet { get; set; }
+        public string Gateway { get; set; }
+        public string Dns1 { get; set; }
+        public string Dns2 { get; set; }
+        public string Dns3 { get; set; }
+        public string Domain { get; set; }
+    }
+}

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

@@ -1,175 +1,180 @@
-using System;
-using System.Text.RegularExpressions;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.CrestronDataStore;
-using Crestron.SimplSharpPro;
-
-using PepperDash.Core;
-using PepperDash.Essentials.License;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
-
-
-namespace PepperDash.Essentials.Core
-{
-	public static class Global
-	{
+using System;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp;
+using System.Collections.Generic;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharp.CrestronDataStore;
+using Crestron.SimplSharpPro;
+
+using PepperDash.Core;
+using PepperDash.Essentials.License;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+
+
+namespace PepperDash.Essentials.Core
+{
+	public static class Global
+	{
 		public static CrestronControlSystem ControlSystem { get; set; }
 
-		public static LicenseManager LicenseManager { get; set; }
-
-        /// <summary>
-        /// The file path prefix to the folder containing configuration files
-        /// </summary>
-        public static string FilePathPrefix { get; private set; }
-
-        /// <summary>
-        /// The file path prefix to the applciation directory
-        /// </summary>
-        public static string ApplicationDirectoryPathPrefix 
-        {
-            get
-            {
-                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
-            }
-        }
-
-        /// <summary>
-        /// Returns the directory separator character based on the running OS
-        /// </summary>
-        public static char DirectorySeparator
-        {
-            get
-            {
-                return System.IO.Path.DirectorySeparatorChar;
-            }
-        }
-
-        /// <summary>
-        /// Wildcarded config file name for global reference
-        /// </summary>
-        public const string ConfigFileName = "*configurationFile*.json";
-
-        /// <summary>
-        /// Sets the file path prefix
-        /// </summary>
-        /// <param name="prefix"></param>
-        public static void SetFilePathPrefix(string prefix)
-        {
-            FilePathPrefix = prefix;
-        }
-
-        static string _AssemblyVersion;
-
-        /// <summary>
-        /// Gets the Assembly Version of Essentials
-        /// </summary>
-        /// <returns>The Assembly Version at Runtime</returns>
-        public static string AssemblyVersion
-        {
-            get
-            {
-                return _AssemblyVersion;
-            }
-            private set
-            {
-                _AssemblyVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Sets the Assembly version to the version of the Essentials Library
-        /// </summary>
-        /// <param name="assemblyVersion"></param>
-        public static void SetAssemblyVersion(string assemblyVersion)
-        {
-            AssemblyVersion = assemblyVersion;
-        }
-
-        /// <summary>
-        /// Checks to see if the running version meets or exceed the minimum specified version.  For beta versions (0.xx.yy), will always return true.
-        /// </summary>
-        /// <param name="minimumVersion">Minimum specified version in format of xx.yy.zz</param>
-        /// <returns>Returns true if the running version meets or exceeds the minimum specified version</returns>
-        public static bool IsRunningMinimumVersionOrHigher(string minimumVersion)
-        {
-            Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
-
-            if (String.IsNullOrEmpty(minimumVersion))
-            {
-                Debug.Console(0,"Plugin does not specify a minimum version. Loading plugin may not work as expected. Proceeding with loading plugin");
-                return true;
-            }
-            
-            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
-
-            var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
-            var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
-            var runtimeVersionBuild = Int16.Parse(runtimeVersion.Groups[3].Value);
-
-            var runtimeVer = new Version(runtimeVersionMajor, runtimeVersionMinor, runtimeVersionBuild);
-
-            Version minimumVer;
-            try
-            {
-                minimumVer = new Version(minimumVersion);
-            }
-            catch
-            {
-                Debug.Console(2, "unable to parse minimum version {0}. Bypassing plugin load.", minimumVersion);
-                return false;
-            }
-
-
-            // Check for beta build version
-            if (runtimeVer.Major != 0)
-            {
-                return runtimeVer.CompareTo(minimumVer) >= 0;
-            }
-
-            Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
-            return true;
-
-            /*
-            var minVersion = Regex.Match(minimumVersion, @"^(\d*).(\d*).(\d*)$");
-
-            if(!minVersion.Success)
-            {
-                
-            }
-
-            var minVersionMajor = Int16.Parse(minVersion.Groups[1].Value);
-            var minVersionMinor = Int16.Parse(minVersion.Groups[2].Value);
-            var minVersionBuild = Int16.Parse(minVersion.Groups[3].Value);
-
-
-
-            if (minVersionMajor > runtimeVersionMajor)
-                return false;
-
-            if (minVersionMinor > runtimeVersionMinor)
-                return false;
-
-            if (minVersionBuild > runtimeVersionBuild)
-                return false;
-
-            return true;
-             */
-        }
-
-		static Global()
-		{
-			// Fire up CrestronDataStoreStatic
-			var err = CrestronDataStoreStatic.InitCrestronDataStore();
-			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-			{
-				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
-				return;
-			}
-		}
-
-	}
+        public static eDevicePlatform Platform { get { return CrestronEnvironment.DevicePlatform; } }
+
+        public static Dictionary<short, EthernetAdapterInfo> EthernetAdapterInfoCollection { get; private set; }
+
+		public static LicenseManager LicenseManager { get; set; }
+
+        /// <summary>
+        /// The file path prefix to the folder containing configuration files
+        /// </summary>
+        public static string FilePathPrefix { get; private set; }
+
+        /// <summary>
+        /// The file path prefix to the applciation directory
+        /// </summary>
+        public static string ApplicationDirectoryPathPrefix 
+        {
+            get
+            {
+                return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory();
+            }
+        }
+
+        /// <summary>
+        /// Returns the directory separator character based on the running OS
+        /// </summary>
+        public static char DirectorySeparator
+        {
+            get
+            {
+                return System.IO.Path.DirectorySeparatorChar;
+            }
+        }
+
+        /// <summary>
+        /// Wildcarded config file name for global reference
+        /// </summary>
+        public const string ConfigFileName = "*configurationFile*.json";
+
+        /// <summary>
+        /// Sets the file path prefix
+        /// </summary>
+        /// <param name="prefix"></param>
+        public static void SetFilePathPrefix(string prefix)
+        {
+            FilePathPrefix = prefix;
+        }
+
+        static string _AssemblyVersion;
+
+        /// <summary>
+        /// Gets the Assembly Version of Essentials
+        /// </summary>
+        /// <returns>The Assembly Version at Runtime</returns>
+        public static string AssemblyVersion
+        {
+            get
+            {
+                return _AssemblyVersion;
+            }
+            private set
+            {
+                _AssemblyVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the Assembly version to the version of the Essentials Library
+        /// </summary>
+        /// <param name="assemblyVersion"></param>
+        public static void SetAssemblyVersion(string assemblyVersion)
+        {
+            AssemblyVersion = assemblyVersion;
+        }
+
+        /// <summary>
+        /// Checks to see if the running version meets or exceed the minimum specified version.  For beta versions (0.xx.yy), will always return true.
+        /// </summary>
+        /// <param name="minimumVersion">Minimum specified version in format of xx.yy.zz</param>
+        /// <returns>Returns true if the running version meets or exceeds the minimum specified version</returns>
+        public static bool IsRunningMinimumVersionOrHigher(string minimumVersion)
+        {
+            Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
+
+            if (String.IsNullOrEmpty(minimumVersion))
+            {
+                Debug.Console(0,"Plugin does not specify a minimum version. Loading plugin may not work as expected. Proceeding with loading plugin");
+                return true;
+            }
+            
+            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
+
+            var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
+            var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
+            var runtimeVersionBuild = Int16.Parse(runtimeVersion.Groups[3].Value);
+
+            var runtimeVer = new Version(runtimeVersionMajor, runtimeVersionMinor, runtimeVersionBuild);
+
+            Version minimumVer;
+            try
+            {
+                minimumVer = new Version(minimumVersion);
+            }
+            catch
+            {
+                Debug.Console(2, "unable to parse minimum version {0}. Bypassing plugin load.", minimumVersion);
+                return false;
+            }
+
+
+            // Check for beta build version
+            if (runtimeVer.Major != 0)
+            {
+                return runtimeVer.CompareTo(minimumVer) >= 0;
+            }
+
+            Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
+            return true;
+
+            /*
+            var minVersion = Regex.Match(minimumVersion, @"^(\d*).(\d*).(\d*)$");
+
+            if(!minVersion.Success)
+            {
+                
+            }
+
+            var minVersionMajor = Int16.Parse(minVersion.Groups[1].Value);
+            var minVersionMinor = Int16.Parse(minVersion.Groups[2].Value);
+            var minVersionBuild = Int16.Parse(minVersion.Groups[3].Value);
+
+
+
+            if (minVersionMajor > runtimeVersionMajor)
+                return false;
+
+            if (minVersionMinor > runtimeVersionMinor)
+                return false;
+
+            if (minVersionBuild > runtimeVersionBuild)
+                return false;
+
+            return true;
+             */
+        }
+
+		static Global()
+		{
+			// Fire up CrestronDataStoreStatic
+			var err = CrestronDataStoreStatic.InitCrestronDataStore();
+			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+			{
+				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
+				return;
+			}
+		}
+
+	}
 }

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

@@ -48,48 +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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
@@ -98,33 +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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -158,6 +146,7 @@
     <Compile Include="Bridges\JoinMaps\SetTopBoxControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\StatusSignControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\SystemMonitorJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\VideoCodecControllerJoinMap.cs" />
     <Compile Include="Comm and IR\CecPortController.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
@@ -206,6 +195,7 @@
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
+    <Compile Include="DeviceTypeInterfaces\IHasBranding.cs" />
     <Compile Include="DeviceTypeInterfaces\IMobileControl.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Factory\IDeviceFactory.cs" />
@@ -223,6 +213,7 @@
     <Compile Include="Fusion\FusionRviDataClasses.cs" />
     <Compile Include="Gateways\CenRfgwController.cs" />
     <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
+    <Compile Include="Global\EthernetAdapterInfo.cs" />
     <Compile Include="Queues\ComsMessage.cs" />
     <Compile Include="Queues\ProcessStringMessage.cs" />
     <Compile Include="Queues\GenericQueue.cs" />

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Receivers/DmRmc4kZScalerCController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;

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

@@ -48,18 +48,15 @@
   <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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
@@ -78,8 +75,7 @@
     </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>
-      <Private>True</Private>
+      <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>
@@ -88,8 +84,7 @@
     </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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs

@@ -92,6 +92,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraPanControl : IHasCameraControls
     {
+        // void PanLeft(bool pressRelease);
+        // void PanRight(bool pressRelease);
         void PanLeft();
         void PanRight();
         void PanStop();
@@ -102,6 +104,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraTiltControl : IHasCameraControls
     {
+        // void TiltDown(bool pressRelease);
+        // void TildUp(bool pressRelease);
         void TiltDown();
         void TiltUp();
         void TiltStop();
@@ -112,6 +116,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraZoomControl : IHasCameraControls
     {
+        // void ZoomIn(bool pressRelease);
+        // void ZoomOut(bool pressRelease);
         void ZoomIn();
         void ZoomOut();
         void ZoomStop();
@@ -129,13 +135,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         void TriggerAutoFocus();
     }
 
-    public interface IHasAutoFocusMode
-    {
-        void SetFocusModeAuto();
-        void SetFocusModeManual();
-        void ToggleFocusMode();
-    }
-
     public interface IHasCameraAutoMode : IHasCameraControls
     {
         void CameraAutoModeOn();

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraVisca.cs

@@ -12,85 +12,29 @@ using PepperDash.Essentials.Devices.Common.Codec;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp.Reflection;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
-	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IPower, IBridgeAdvanced, IHasCameraFocusControl, IHasAutoFocusMode
+	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IPower, IBridgeAdvanced
 	{
-        CameraViscaPropertiesConfig PropertiesConfig;
-
 		public IBasicCommunication Communication { get; private set; }
+		public CommunicationGather PortGather { get; private set; }
 
 		public StatusMonitorBase CommunicationMonitor { get; private set; }
 
-        /// <summary>
-        /// Used to store the actions to parse inquiry responses as the inquiries are sent
-        /// </summary>
-        private CrestronQueue<Action<byte[]>> InquiryResponseQueue;
-
-        /// <summary>
-        /// Camera ID (Default 1)
-        /// </summary>
-        public byte ID = 0x01;
-        public byte ResponseID;
-
-
-		public byte PanSpeedSlow = 0x10;
-		public byte TiltSpeedSlow = 0x10;
-
-        public byte PanSpeedFast = 0x13;
-        public byte TiltSpeedFast = 0x13;
-
+		public byte PanSpeed = 0x10;
+		public byte TiltSpeed = 0x10;
 		private bool IsMoving;
 		private bool IsZooming;
-
-        bool _powerIsOn;
-		public bool PowerIsOn 
-        {
-            get
-            {
-                return _powerIsOn;
-            }
-            private set
-            {
-                if (value != _powerIsOn)
-                {
-                    _powerIsOn = value;
-                    PowerIsOnFeedback.FireUpdate();
-                }
-            }
-        }
-
-        const byte ZoomInCmd = 0x02;
-        const byte ZoomOutCmd = 0x03;
-        const byte ZoomStopCmd = 0x00;
-
-        /// <summary>
-        /// Used to determine when to move the camera at a faster speed if a direction is held
-        /// </summary>
-        CTimer SpeedTimer;
-        // TODO: Implment speed timer for PTZ controls
-
-        long FastSpeedHoldTimeMs = 2000;
+		public bool PowerIsOn { get; private set; }
 
 		byte[] IncomingBuffer = new byte[] { };
 		public BoolFeedback PowerIsOnFeedback  { get; private set; }
 
-        public CameraVisca(string key, string name, IBasicCommunication comm, CameraViscaPropertiesConfig props) :
+		public CameraVisca(string key, string name, IBasicCommunication comm, CameraPropertiesConfig props) :
 			base(key, name)
 		{
-            InquiryResponseQueue = new CrestronQueue<Action<byte[]>>(15);
-
             Presets = props.Presets;
 
-            PropertiesConfig = props;
-
-            ID = (byte)(props.Id + 0x80);
-            ResponseID = (byte)((props.Id * 0x10) + 0x80);
-
-            SetupCameraSpeeds();
-
             OutputPorts.Add(new RoutingOutputPort("videoOut", eRoutingSignalType.Video, eRoutingPortConnectionType.None, null, this, true));
 
             // Default to all capabilties
@@ -107,6 +51,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 			{
 				// This instance uses RS-232 control
 			}
+			PortGather = new CommunicationGather(Communication, "\xFF");
+
 
 			Communication.BytesReceived += new EventHandler<GenericCommMethodReceiveBytesArgs>(Communication_BytesReceived);
 			PowerIsOnFeedback = new BoolFeedback(() => { return PowerIsOn; });
@@ -120,38 +66,9 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 				CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 20000, 120000, 300000, "\x81\x09\x04\x00\xFF");
 			}
 			DeviceManager.AddDevice(CommunicationMonitor);
+
+
 		}
-
-
-        /// <summary>
-        /// Sets up camera speed values based on config
-        /// </summary>
-        void SetupCameraSpeeds()
-        {
-            if (PropertiesConfig.FastSpeedHoldTimeMs > 0)
-            {
-                FastSpeedHoldTimeMs = PropertiesConfig.FastSpeedHoldTimeMs;
-            }
-
-            if (PropertiesConfig.PanSpeedSlow > 0)
-            {
-                PanSpeedSlow = (byte)PropertiesConfig.PanSpeedSlow;
-            }
-            if (PropertiesConfig.PanSpeedFast > 0)
-            {
-                PanSpeedFast = (byte)PropertiesConfig.PanSpeedFast;
-            }
-
-            if (PropertiesConfig.TiltSpeedSlow > 0)
-            {
-                TiltSpeedSlow = (byte)PropertiesConfig.TiltSpeedSlow;
-            }
-            if (PropertiesConfig.TiltSpeedFast > 0)
-            {
-                TiltSpeedFast = (byte)PropertiesConfig.TiltSpeedFast;
-            }
-        }
-
 		public override bool CustomActivate()
 		{
 			Communication.Connect();
@@ -193,245 +110,40 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
 			Communication.SendBytes(b);
 		}
-
 		void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
 		{
-            var newBytes = new byte[IncomingBuffer.Length + e.Bytes.Length];
-
-            try
-            {
-                // This is probably not thread-safe buffering
-                // Append the incoming bytes with whatever is in the buffer
-                IncomingBuffer.CopyTo(newBytes, 0);
-                e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);
-                if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
-                    Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
-
-                byte[] message = new byte[] { };
-
-                // Search for the delimiter 0xFF character
-                for (int i = 0; i < newBytes.Length; i++)
-                {
-                    if (newBytes[i] == 0xFF)
-                    {
-                        // i will be the index of the delmiter character
-                        message = newBytes.Take(i).ToArray();
-                        // Skip over what we just took and save the rest for next time
-                        newBytes = newBytes.Skip(i).ToArray();
-                    }
-                }
-
-                if (message.Length > 0)
-                {
-                    // Check for matching ID
-                    if (message[0] != ResponseID)
-                    {
-                        return;
-                    }
-
-                    switch (message[1])
-                    {
-                        case 0x40:
-                            {
-                                // ACK received
-                                Debug.Console(2, this, "ACK Received");
-                                break;
-                            }
-                        case 0x50:
-                            {
-
-                                if (message[2] == 0xFF)
-                                {
-                                    // Completion received
-                                    Debug.Console(2, this, "Completion Received");
-                                }
-                                else
-                                {
-                                    // Inquiry response received.  Dequeue the next response handler and invoke it
-                                    if (InquiryResponseQueue.Count > 0)
-                                    {
-                                        var inquiryAction = InquiryResponseQueue.Dequeue();
-
-                                        inquiryAction.Invoke(message.Skip(2).ToArray());
-                                    }
-                                    else
-                                    {
-                                        Debug.Console(2, this, "Response Queue is empty. Nothing to dequeue.");
-                                    }
-                                }
-
-                                break;
-                            }
-                        case 0x60:
-                            {
-                                // Error message
-
-                                switch (message[2])
-                                {
-                                    case 0x01:
-                                        {
-                                            // Message Length Error
-                                            Debug.Console(2, this, "Error from device: Message Length Error");
-                                            break;
-                                        }
-                                    case 0x02:
-                                        {
-                                            // Syntax Error
-                                            Debug.Console(2, this, "Error from device: Syntax Error");
-                                            break;
-                                        }
-                                    case 0x03:
-                                        {
-                                            // Command Buffer Full
-                                            Debug.Console(2, this, "Error from device: Command Buffer Full");
-                                            break;
-                                        }
-                                    case 0x04:
-                                        {
-                                            // Command Cancelled
-                                            Debug.Console(2, this, "Error from device: Command Cancelled");
-                                            break;
-                                        }
-                                    case 0x05:
-                                        {
-                                            // No Socket
-                                            Debug.Console(2, this, "Error from device: No Socket");
-                                            break;
-                                        }
-                                    case 0x41:
-                                        {
-                                            // Command not executable
-                                            Debug.Console(2, this, "Error from device: Command not executable");
-                                            break;
-                                        }
-                                }
-                                break;
-                            }
-                    }
-
-                    if (message == new byte[] { ResponseID, 0x50, 0x02, 0xFF })
-                    {
-                        PowerIsOn = true;
-                    }
-                    else if (message == new byte[] { ResponseID, 0x50, 0x03, 0xFF })
-                    {
-                        PowerIsOn = false;
-                    }
-
-                }
-
-            }
-            catch (Exception err)
-            {
-                Debug.Console(2, this, "Error parsing feedback: {0}", err);
-            }
-            finally
-            {
-                // Save whatever partial message is here
-                IncomingBuffer = newBytes;
-            }
-        }
-
-        /// <summary>
-        /// Sends a pan/tilt command. If the command is not for fastSpeed then it starts a timer to initiate fast speed.
-        /// </summary>
-        /// <param name="cmd"></param>
-        /// <param name="fastSpeed"></param>
-		private void SendPanTiltCommand (byte[] cmd, bool fastSpeedEnabled)
-		{
-            SendBytes(GetPanTiltCommand(cmd, fastSpeedEnabled));
-
-            if (!fastSpeedEnabled)
-            {
-                if (SpeedTimer != null)
-                {
-                    StopSpeedTimer();
-                }
-
-                // Start the timer to send fast speed if still moving after FastSpeedHoldTime elapses
-                SpeedTimer = new CTimer((o) => SendPanTiltCommand(GetPanTiltCommand(cmd, true), true), FastSpeedHoldTimeMs);
-            }
-
+			// This is probably not thread-safe buffering
+			// Append the incoming bytes with whatever is in the buffer
+			var newBytes = new byte[IncomingBuffer.Length + e.Bytes.Length];
+			IncomingBuffer.CopyTo(newBytes, 0);
+			e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);
+			if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
+				Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
 		}
 
-        private void StopSpeedTimer()
-        {
-            if (SpeedTimer != null)
-            {
-                SpeedTimer.Stop();
-                SpeedTimer.Dispose();
-                SpeedTimer = null;
-            }     
-        }
 
-        /// <summary>
-        /// Generates the pan/tilt command with either slow or fast speed
-        /// </summary>
-        /// <param name="cmd"></param>
-        /// <param name="fastSpeed"></param>
-        /// <returns></returns>
-        private byte[] GetPanTiltCommand(byte[] cmd, bool fastSpeed)
-        {
-            byte panSpeed;
-            byte tiltSpeed;
-
-            if (!fastSpeed)
-            {
-                panSpeed = PanSpeedSlow;
-                tiltSpeed = TiltSpeedSlow;
-            }
-            else
-            {
-                panSpeed = PanSpeedFast;
-                tiltSpeed = TiltSpeedFast;
-            }
-
-            var temp = new byte[] { ID, 0x01, 0x06, 0x01, panSpeed, tiltSpeed };
-            int length = temp.Length + cmd.Length + 1;
-
-            byte[] sum = new byte[length];
-            temp.CopyTo(sum, 0);
-            cmd.CopyTo(sum, temp.Length);
-            sum[length - 1] = 0xFF;
-
-            return sum;
-        }
-
-
-        void SendPowerQuery()
-        {
-            SendBytes(new byte[] { ID, 0x09, 0x04, 0x00, 0xFF });
-            InquiryResponseQueue.Enqueue(HandlePowerResponse);
-        }
+		private void SendPanTiltCommand (byte[] cmd)
+		{
+			var temp = new Byte[] { 0x81, 0x01, 0x06, 0x01, PanSpeed, TiltSpeed };
+			int length = temp.Length + cmd.Length + 1;
+			
+			byte[] sum = new byte[length];
+			temp.CopyTo(sum, 0);
+			cmd.CopyTo(sum, temp.Length);
+			sum[length - 1] = 0xFF;
+			SendBytes(sum);			
+		}
 
 		public void PowerOn()
 		{
-			SendBytes(new byte[] { ID, 0x01, 0x04, 0x00, 0x02, 0xFF });
-            SendPowerQuery();
-		}
 
-        void HandlePowerResponse(byte[] response)
-        {
-            switch (response[0])
-            {
-                case 0x02:
-                    {
-                        PowerIsOn = true;
-                        break;
-                    }
-                case 0x03:
-                    {
-                        PowerIsOn = false;
-                        break;
-                    }
-            }
-        }
+			SendBytes(new Byte[] { 0x81, 0x01, 0x04, 0x00, 0x02, 0xFF });
+		}
 
 		public void PowerOff()
 		{
-			SendBytes(new byte[] {ID, 0x01, 0x04, 0x00, 0x03, 0xFF});
-            SendPowerQuery();
-        }
+			SendBytes(new Byte[] {0x81, 0x01, 0x04, 0x00, 0x03, 0xFF});
+		}
 
         public void PowerToggle()
         {
@@ -443,12 +155,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
 		public void PanLeft() 
 		{
-			SendPanTiltCommand(new byte[] {0x01, 0x03}, false);
+			SendPanTiltCommand(new byte[] {0x01, 0x03});
 			IsMoving = true;
 		}
 		public void PanRight() 
 		{
-            SendPanTiltCommand(new byte[] { 0x02, 0x03 }, false);
+			SendPanTiltCommand(new byte[] { 0x02, 0x03 });
 			IsMoving = true;
 		}
         public void PanStop()
@@ -457,12 +169,12 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         }
 		public void TiltDown() 
 		{
-            SendPanTiltCommand(new byte[] { 0x03, 0x02 }, false);
+			SendPanTiltCommand(new byte[] { 0x03, 0x02 });
 			IsMoving = true;
 		}
 		public void TiltUp() 
 		{
-            SendPanTiltCommand(new byte[] { 0x03, 0x01 }, false);
+			SendPanTiltCommand(new byte[] { 0x03, 0x01 });
 			IsMoving = true;
 		}
         public void TiltStop()
@@ -472,18 +184,16 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 
 		private void SendZoomCommand (byte cmd)
 		{
-			SendBytes(new byte[] {ID, 0x01, 0x04, 0x07, cmd, 0xFF} );
+			SendBytes(new byte[] {0x81, 0x01, 0x04, 0x07, cmd, 0xFF} );
 		}
-
-
 		public void ZoomIn() 
 		{
-            SendZoomCommand(ZoomInCmd);
+			SendZoomCommand(0x02);
 			IsZooming = true;
 		}
 		public void ZoomOut() 
 		{
-            SendZoomCommand(ZoomOutCmd);
+			SendZoomCommand(0x03);
 			IsZooming = true;
 		}
         public void ZoomStop()
@@ -495,28 +205,26 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 		{
 			if (IsZooming)
 			{
-                SendZoomCommand(ZoomStopCmd);
+				SendZoomCommand(0x00);
 				IsZooming = false;
 			}
 			else
 			{
-                StopSpeedTimer();
-                SendPanTiltCommand(new byte[] { 0x03, 0x03 }, false);
+				SendPanTiltCommand(new byte[] {0x03, 0x03});
 				IsMoving = false;
 			}
 		}
         public void PositionHome()
         {
-            SendBytes(new byte[] { ID, 0x01, 0x06, 0x02, PanSpeedFast, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF });
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x47, 0x00, 0x00, 0x00, 0x00, 0xFF });
+            throw new NotImplementedException();
         }
 		public void RecallPreset(int presetNumber)
 		{
-			SendBytes(new byte[] {ID, 0x01, 0x04, 0x3F, 0x02, (byte)presetNumber, 0xFF} );
+			SendBytes(new byte[] {0x81, 0x01, 0x04, 0x3F, 0x02, (byte)presetNumber, 0xFF} );
 		}
 		public void SavePreset(int presetNumber)
 		{
-			SendBytes(new byte[] { ID, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
+			SendBytes(new byte[] { 0x81, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
 		}
 
         #region IHasCameraPresets Members
@@ -536,78 +244,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         }
 
         #endregion
-
-        #region IHasCameraFocusControl Members
-
-        public void FocusNear()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x08, 0x03, 0xFF });
-        }
-
-        public void FocusFar()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x08, 0x02, 0xFF });
-        }
-
-        public void FocusStop()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x08, 0x00, 0xFF });
-        }
-
-        public void TriggerAutoFocus()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x18, 0x01, 0xFF });
-            SendAutoFocusQuery();
-        }
-
-        #endregion
-
-        #region IHasAutoFocus Members
-
-        public void SetFocusModeAuto()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x38, 0x02, 0xFF });
-            SendAutoFocusQuery();
-        }
-
-        public void SetFocusModeManual()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x38, 0x03, 0xFF });
-            SendAutoFocusQuery();
-        }
-
-        public void ToggleFocusMode()
-        {
-            SendBytes(new byte[] { ID, 0x01, 0x04, 0x38, 0x10, 0xFF });
-            SendAutoFocusQuery();
-        }
-
-        #endregion
-
-        void SendAutoFocusQuery()
-        {
-            SendBytes(new byte[] { ID, 0x09, 0x04, 0x38, 0xFF });
-            InquiryResponseQueue.Enqueue(HandleAutoFocusResponse);
-        }
-
-        void HandleAutoFocusResponse(byte[] response)
-        {
-            switch (response[0])
-            {
-                case 0x02:
-                    {
-                        // Auto Mode
-                        PowerIsOn = true;
-                        break;
-                    }
-                case 0x03:
-                    {
-                        // Manual Mode
-                        PowerIsOn = false;
-                        break;
-                    }
-            }
-        }
     }
 
     public class CameraViscaFactory : EssentialsDeviceFactory<CameraVisca>
@@ -621,51 +257,10 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         {
             Debug.Console(1, "Factory Attempting to create new CameraVisca Device");
             var comm = CommFactory.CreateCommForDevice(dc);
-            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Cameras.CameraViscaPropertiesConfig>(
+            var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Cameras.CameraPropertiesConfig>(
                 dc.Properties.ToString());
             return new Cameras.CameraVisca(dc.Key, dc.Name, comm, props);
         }
     }
 
-
-    public class CameraViscaPropertiesConfig : CameraPropertiesConfig
-    {
-        /// <summary>
-        /// Control ID of the camera (1-7)
-        /// </summary>
-        [JsonProperty("id")]
-        public uint Id { get; set; }
-
-        /// <summary>
-        /// Slow Pan speed (0-18)
-        /// </summary>
-        [JsonProperty("panSpeedSlow")]
-        public uint PanSpeedSlow { get; set; }
-
-        /// <summary>
-        /// Fast Pan speed (0-18)
-        /// </summary>
-        [JsonProperty("panSpeedFast")]
-        public uint PanSpeedFast { get; set; }
-
-        /// <summary>
-        /// Slow tilt speed (0-18)
-        /// </summary>
-        [JsonProperty("tiltSpeedSlow")] 
-        public uint TiltSpeedSlow { get; set; }
-
-        /// <summary>
-        /// Fast tilt speed (0-18)
-        /// </summary>
-        [JsonProperty("tiltSpeedFast")]
-        public uint TiltSpeedFast { get; set; }
-
-        /// <summary>
-        /// Time a button must be held before fast speed is engaged (Milliseconds)
-        /// </summary>
-        [JsonProperty("fastSpeedHoldTimeMs")]
-        public uint FastSpeedHoldTimeMs { get; set; }
-
-    }
-
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -40,9 +40,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         /// <summary>
         /// Tracks the directory browse history when browsing beyond the root directory
         /// </summary>
+        [Obsolete("Please use the Stack-based history instead")]
         List<CodecDirectory> DirectoryBrowseHistory { get; }
     }
 
+    public interface IHasDirectoryHistoryStack : IHasDirectory
+    {
+        Stack<CodecDirectory> DirectoryBrowseHistoryStack { get; } 
+    }
+
 	/// <summary>
 	/// 
 	/// </summary>
@@ -147,6 +153,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 
 		[JsonProperty("name")]	
         public string Name { get; set; }
+
+        [JsonProperty("parentFolderId")]
+        public string ParentFolderId { get; set; }
     }
 
 	/// <summary>
@@ -157,8 +166,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("contacts")]
         public List<DirectoryContact> Contacts { get; set; }
 
-		[JsonProperty("parentFolderId")]
-        public string ParentFolderId { get; set; }
 
         public DirectoryFolder()
         {
@@ -177,6 +184,8 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("title")]
         public string Title { get; set; }
 
+        
+
 		[JsonProperty("contactMethods")]
         public List<ContactMethod> ContactMethods { get; set; }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasScheduleAwareness.cs

@@ -24,24 +24,32 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 
     public class CodecScheduleAwareness
     {
-        List<Meeting> _Meetings;
+        List<Meeting> _meetings;
 
         public event EventHandler<MeetingEventArgs> MeetingEventChange;
 
         public event EventHandler<EventArgs> MeetingsListHasChanged;
 
-		/// <summary>
+        private int _meetingWarningMinutes = 5;
+
+        public int MeetingWarningMinutes
+        {
+            get { return _meetingWarningMinutes; }
+            set { _meetingWarningMinutes = value; }
+        }
+
+        /// <summary>
 		/// Setter triggers MeetingsListHasChanged event
 		/// </summary>
         public List<Meeting> Meetings
         {
             get
             {
-                return _Meetings;
+                return _meetings;
             }
             set
             {
-                _Meetings = value;
+                _meetings = value;
 
                 var handler = MeetingsListHasChanged;
                 if (handler != null)
@@ -51,13 +59,20 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             }
         }
 
-        private CTimer ScheduleChecker;
+        private CTimer _scheduleChecker;
 
         public CodecScheduleAwareness()
         {
             Meetings = new List<Meeting>();
 
-            ScheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
+            _scheduleChecker = new CTimer(CheckSchedule, null, 1000, 1000);
+        }
+
+        public CodecScheduleAwareness(long pollTime)
+        {
+            Meetings = new List<Meeting>();
+
+            _scheduleChecker = new CTimer(CheckSchedule, null, pollTime, pollTime);
         }
 
         private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
@@ -74,9 +89,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
             //  Iterate the meeting list and check if any meeting need to do anythingk
 
             const double meetingTimeEpsilon = 0.0001;
-            foreach (Meeting m in Meetings)
+            foreach (var m in Meetings)
             {
-                eMeetingEventChangeType changeType = eMeetingEventChangeType.Unkown;
+                var changeType = eMeetingEventChangeType.Unkown;
 
                 if (m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes)       // Meeting is about to start
                     changeType = eMeetingEventChangeType.MeetingStartWarning;
@@ -100,12 +115,17 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public class Meeting
     {
-        public TimeSpan MeetingWarningMinutes = TimeSpan.FromMinutes(5);
+        public int MinutesBeforeMeeting;
 
         public string Id { get; set; }
         public string Organizer { get; set; }
         public string Title { get; set; }
         public string Agenda { get; set; }
+
+        public TimeSpan MeetingWarningMinutes
+        {
+            get { return TimeSpan.FromMinutes(MinutesBeforeMeeting); }
+        }
         public TimeSpan TimeToMeetingStart
         {
             get
@@ -134,7 +154,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         {
             get
             {
-                return StartTime.AddMinutes(-5) <= DateTime.Now
+                return StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
                     && DateTime.Now <= EndTime; //.AddMinutes(-5);
             }
         }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -48,23 +48,19 @@
   <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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.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>
-      <Private>True</Private>
+      <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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.41.31808, Culture=neutral, processorArchitecture=MSIL">
@@ -83,8 +79,7 @@
     </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>
-      <Private>True</Private>
+      <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>
@@ -93,8 +88,7 @@
     </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>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -126,6 +120,7 @@
     <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
     <Compile Include="Cameras\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs

@@ -17,7 +17,6 @@ using PepperDash.Essentials.Core.CrestronIO;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.DSP;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
-using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.Environment;
 
 namespace PepperDash.Essentials.Devices.Common

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

@@ -5,17 +5,20 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
-
+using Crestron.SimplSharpPro.DeviceSupport;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 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.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
@@ -25,10 +28,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
     public class CiscoSparkCodec : VideoCodecBase, IHasCallHistory, IHasCallFavorites, IHasDirectory,
         IHasScheduleAwareness, IOccupancyStatusProvider, IHasCodecLayouts, IHasCodecSelfView,
-        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching
+        ICommunicationMonitor, IRouting, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IHasExternalSourceSwitching, IHasBranding
     {
         public event EventHandler<DirectoryEventArgs> DirectoryResultReturned;
 
+        private CTimer _brandingTimer;
+
         public CommunicationGather PortGather { get; private set; }
 
         public StatusMonitorBase CommunicationMonitor { get; private set; }
@@ -401,13 +406,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
 			CreateOsdSource();
 
-			if (props.ExternalSourceListEnabled != null)
-			{
-				ExternalSourceListEnabled = props.ExternalSourceListEnabled;
-			}
+            ExternalSourceListEnabled = props.ExternalSourceListEnabled;
+
+            if (props.UiBranding == null)
+            {
+                return;
+            }
+            Debug.Console(2, this, "Setting branding properties enable: {0} _brandingUrl {1}", props.UiBranding.Enable,
+                props.UiBranding.BrandingUrl);
+
+            BrandingEnabled = props.UiBranding.Enable;
+            _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
-        /// <summary>
         /// Runs in it's own thread to dequeue messages in the order they were received to be processed
         /// </summary>
         /// <returns></returns>
@@ -443,6 +454,83 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			TieLineCollection.Default.Add(tl);
 		}
 
+        public void InitializeBranding(string roomKey)
+        {
+            Debug.Console(1, this, "Initializing Branding for room {0}", roomKey);
+
+            if (!BrandingEnabled)
+            {
+                return;
+            }
+
+            var mcBridgeKey = String.Format("mobileControlBridge-{0}", roomKey);
+
+            var mcBridge = DeviceManager.GetDeviceForKey(mcBridgeKey) as IMobileControlRoomBridge;
+
+            if (!String.IsNullOrEmpty(_brandingUrl))
+            {
+                Debug.Console(1, this, "Branding URL found: {0}", _brandingUrl);
+                if (_brandingTimer != null)
+                {
+                    _brandingTimer.Stop();
+                    _brandingTimer.Dispose();
+                }
+
+                _brandingTimer = new CTimer((o) =>
+                {
+                    if (_sendMcUrl)
+                    {
+                        SendMcBrandingUrl(mcBridge);
+                        _sendMcUrl = false;
+                    }
+                    else
+                    {
+                        SendBrandingUrl();
+                        _sendMcUrl = true;
+                    }
+                }, 0, 15000);
+            } else if (String.IsNullOrEmpty(_brandingUrl))
+            {
+                Debug.Console(1, this, "No Branding URL found");
+                if (mcBridge == null) return;
+
+                Debug.Console(2, this, "Setting QR code URL: {0}", mcBridge.QrCodeUrl);
+
+                mcBridge.UserCodeChanged += (o, a) => SendMcBrandingUrl(mcBridge);
+
+                SendMcBrandingUrl(mcBridge);
+            }
+        }
+
+        private void SendMcBrandingUrl(IMobileControlRoomBridge mcBridge)
+        {
+            if (mcBridge == null)
+            {
+                return;
+            }
+
+            Debug.Console(1, this, "Sending url: {0}", mcBridge.QrCodeUrl);
+
+            SendText("xconfiguration userinterface custommessage: \"Scan the QR code with a mobile phone to get started\"");
+            SendText("xconfiguration userinterface osd halfwakemessage: \"Tap the touch panel or scan the QR code with a mobile phone to get started\"");
+
+            SendText(String.Format(
+                            "xcommand userinterface branding fetch type: branding url: {0}",
+                            mcBridge.QrCodeUrl));
+            SendText(String.Format(
+                "xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                mcBridge.QrCodeUrl));
+        }
+
+        private void SendBrandingUrl()
+        {
+            Debug.Console(1, this, "Sending url: {0}", _brandingUrl);
+
+            SendText(String.Format("xcommand userinterface branding fetch type: branding url: {0}",
+                            _brandingUrl));
+            SendText(String.Format("xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                _brandingUrl));
+        }
         /// <summary>
         /// Starts the HTTP feedback server and syncronizes state of codec
         /// </summary>
@@ -1388,6 +1476,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xCommand Standby Deactivate");
         }
 
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Reboots the codec
         /// </summary>
@@ -1835,6 +1928,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			private set; 
 		}
 
+        public bool BrandingEnabled { get; private set; }
+        private string _brandingUrl;
+        private bool _sendMcUrl;
+
 		/// <summary>
 		/// Adds an external source to the Cisco 
 		/// </summary>
@@ -2006,6 +2103,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
             Debug.Console(1, "Factory Attempting to create new Cisco Codec Device");
+
             var comm = CommFactory.CreateCommForDevice(dc);
             return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
         }

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

@@ -40,6 +40,9 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("phonebookResultsLimit")]
         public uint PhonebookResultsLimit { get; set; }
 
+        [JsonProperty("UiBranding")]
+        public BrandingLogoProperties UiBranding { get; set; }       
+
     }
 
     public class SharingProperties
@@ -47,4 +50,13 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("autoShareContentWhileInCall")]
         public bool AutoShareContentWhileInCall { get; set; }
     }
+
+    public class BrandingLogoProperties
+    {
+        [JsonProperty("enable")]
+        public bool Enable { get; set; }
+
+        [JsonProperty("brandingUrl")]
+        public string BrandingUrl { get; set; }
+    }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
+{
+    public interface IHasParticipants
+    {
+        CodecParticipants Participants { get; }
+    }
+
+    public interface IHasParticipantVideoMute:IHasParticipants
+    {
+        void MuteVideoForParticipant(int userId);
+        void UnmuteVideoForParticipant(int userId);
+        void ToggleVideoForParticipant(int userId);
+    }
+
+    public interface IHasParticipantAudioMute:IHasParticipantVideoMute
+    {
+        void MuteAudioForParticipant(int userId);
+        void UnmuteAudioForParticipant(int userId);
+        void ToggleAudioForParticipant(int userId);
+    }
+
+    public class CodecParticipants
+    {
+        private List<Participant> _currentParticipants;
+ 
+        public List<Participant> CurrentParticipants {
+            get { return _currentParticipants; }
+            set
+            {
+                _currentParticipants = value;
+                var handler = ParticipantsListHasChanged;
+
+                if(handler == null) return;
+
+                handler(this, new EventArgs());
+            }
+        }
+
+        public event EventHandler<EventArgs> ParticipantsListHasChanged;
+
+        public CodecParticipants()
+        {
+            _currentParticipants = new List<Participant>();
+        }
+    }
+
+    public class Participant
+    {
+        public bool IsHost { get; set; }
+        public string Name { get; set; }
+        public bool CanMuteVideo { get; set; }       
+        public bool CanUnmuteVideo { get; set; }
+        public bool VideoMuteFb { get; set; }
+        public bool AudioMuteFb { get; set; }
+    }
+}

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

@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
-
+using Crestron.SimplSharpPro.DeviceSupport;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Codec;
@@ -226,6 +227,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             _StandbyIsOn = false;
         }
 
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Called by routing to make it happen
         /// </summary>

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

@@ -11,6 +11,7 @@ using PepperDash.Essentials.Devices.Common.Codec;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
@@ -85,6 +86,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         public zConfiguration.Audio Audio { get; set; }
         public zConfiguration.Video Video { get; set; }
         public zConfiguration.Client Client { get; set; }
+        public zConfiguration.Camera Camera { get; set; }
 
         public ZoomRoomConfiguration()
         {
@@ -92,6 +94,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             Audio = new zConfiguration.Audio();
             Video = new zConfiguration.Video();
             Client = new zConfiguration.Client();
+            Camera = new zConfiguration.Camera();
         }
     }
 
@@ -255,9 +258,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             /// <returns></returns>
             public static CodecDirectory ConvertZoomContactsToGeneric(List<Contact> zoomContacts)
             {
-                var directory = new Codec.CodecDirectory();
+                var directory = new CodecDirectory();
 
-                var folders = new List<Codec.DirectoryItem>();
+                var folders = new List<DirectoryItem>();
 
                 var roomFolder = new DirectoryFolder();
 
@@ -272,9 +275,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 {
                     // If so, setup a rooms and contacts folder and add them.
                     roomFolder.Name = "Rooms";
+                    roomFolder.ParentFolderId = "root";
                     roomFolder.FolderId = "rooms";
 
                     contactFolder.Name = "Contacts";
+                    contactFolder.ParentFolderId = "root";
                     contactFolder.FolderId = "contacts";
 
                     folders.Add(roomFolder);
@@ -285,21 +290,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                 try
                 {
-                    if (zoomContacts.Count > 0)
+                    if (zoomContacts.Count == 0) return directory;
                     {
                         foreach (Contact c in zoomContacts)
                         {
-                            var contact = new ZoomDirectoryContact();
-
-                            contact.Name = c.ScreenName;
-                            contact.ContactId = c.Jid;
+                            var contact = new ZoomDirectoryContact {Name = c.ScreenName, ContactId = c.Jid};
 
                             if (folders.Count > 0)
                             {
-                                if (c.IsZoomRoom)
-                                    contact.FolderId = roomFolder.FolderId;
-                                else
-                                    contact.FolderId = contactFolder.FolderId;
+                                contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
                             }
 
                             contacts.Add(contact);
@@ -577,7 +576,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public string meetingID { get; set; }
             public string password { get; set; }
             public string meetingOption { get; set; }
-            public int MeetingNumber { get; set; }
+            public long MeetingNumber { get; set; }
             public string callerName { get; set; }
             public string avatarURL { get; set; }
             public int lifeTime { get; set; }
@@ -701,9 +700,25 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public bool OptimizeVideoSharing { get; set; }
         }
 
-        public class Camera
+        public class Camera : NotifiableObject
         {
-            public bool Mute { get; set; }
+            private bool _mute;
+
+            public bool Mute
+            {
+                get
+                {
+                    return _mute;
+                }
+                set
+                {
+                    if (value != _mute)
+                    {
+                        _mute = value;
+                        NotifyPropertyChanged("Mute");
+                    }
+                }
+            }
         }
 
         public class Microphone : NotifiableObject
@@ -831,13 +846,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 get
                 {
-                    return this._volume;
+                    return _volume;
                 }
                 set
                 {
                     if (value != _volume)
                     {
-                        this._volume = value;
+                        _volume = value;
                         NotifyPropertyChanged("Volume");
                     }
                 }
@@ -913,7 +928,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     /// </summary>
     public class zCommand
     {
-        public partial class BookingsListResult
+        public class BookingsListResult
         {
             [JsonProperty("accessRole")]
             public string AccessRole { get; set; }
@@ -949,8 +964,20 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             public ThirdParty ThirdParty { get; set; }
         }
 
+        public static List<Meeting> GetGenericMeetingsFromBookingResult(List<BookingsListResult> bookings,
+            int minutesBeforeMeetingStart)
+        {
+            var rv = GetGenericMeetingsFromBookingResult(bookings);
+
+            foreach (var meeting in rv)
+            {
+                meeting.MinutesBeforeMeeting = minutesBeforeMeetingStart;
+            }
+
+            return rv;
+        } 
         /// <summary>
-        /// Extracts the necessary meeting values from the Cisco bookings response ans converts them to the generic class
+        /// Extracts the necessary meeting values from the Zoom bookings response and converts them to the generic class
         /// </summary>
         /// <param name="bookings"></param>
         /// <returns></returns>
@@ -983,6 +1010,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                 meeting.Privacy = b.IsPrivate ? eMeetingPrivacy.Private : eMeetingPrivacy.Public;
 
                 // No meeting.Calls data exists for Zoom Rooms.  Leaving out for now.
+                var now = DateTime.Now;
+                if (meeting.StartTime < now && meeting.EndTime < now)
+                {
+                    Debug.Console(1, "Skipping meeting {0}. Meeting is in the past.", meeting.Title);
+                    continue;
+                }
 
                 meetings.Add(meeting);
 
@@ -1070,6 +1103,23 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             {
                 HandStatus = new HandStatus();
             }
+
+            public static List<Participant> GetGenericParticipantListFromParticipantsResult(
+                List<ListParticipant> participants)
+            {
+                return
+                    participants.Select(
+                        p =>
+                            new Participant
+                            {
+                                Name = p.UserName,
+                                IsHost = p.IsHost,
+                                CanMuteVideo = p.IsVideoCanMuteByHost,
+                                CanUnmuteVideo = p.IsVideoCanUnmuteByHost,
+                                AudioMuteFb = p.AudioStatusState == "AUDIO_MUTED",
+                                VideoMuteFb = p.VideoStatusIsSending
+                            }).ToList();
+            }
         }
 
         public class CallinCountryList

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

@@ -79,8 +79,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
         void StartContinueTimer()
         {
-            if(ContinueTimer == null)
-                ContinueTimer = new CTimer((o) => SendContinueAction(LastAction), ContinueTime);
+            if (ContinueTimer == null)
+                ContinueTimer = new CTimer((o) => SendContinueAction(LastAction), null, ContinueTime, ContinueTime);
         }
 
         void SendContinueAction(eZoomRoomCameraAction action)

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

@@ -12,5 +12,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
     public class ZoomRoomPropertiesConfig
     {
         public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
+
+        public bool DisablePhonebookAutoDownload { get; set; }
+        public bool SupportsCameraAutoMode { get; set; }
+        public bool SupportsCameraOff { get; set; }
     }
 }

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.41" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.43-alpha-170" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>