Merge branch 'development' into feature/fix-IBasicVolumeWithFeedback

fix: revert a change that split the interface but could break backwards compatibility #955

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -708,12 +708,11 @@ namespace PepperDash.Essentials
 			IRoutingSink dest = null;
 
 			if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase))
-                dest = DefaultAudioDevice as IRoutingSink;
+                dest = DefaultAudioDevice as IRoutingSinkNoSwitching;
 			else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase))
 				dest = DefaultDisplay;
 			else
-				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSink;
-            
+				dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
 
 			if (dest == null)
 			{

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

@@ -1,60 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Bridges
-{
-    public class PduJoinMapBase : JoinMapBaseAdvanced
-    {
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("Online")]
-        public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutletCount")]
-        public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of COntrolled Outlets", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutletName")]
-        public JoinDataComplete OutletName = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutletEnabled")]
-        public JoinDataComplete OutletEnabled = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Enabled", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutletPowerCycle")]
-        public JoinDataComplete OutletPowerCycle = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Power Cycle", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutletPowerOn")]
-        public JoinDataComplete OutletPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-        [JoinName("OutletPowerOff")]
-        public JoinDataComplete OutletPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "Outlet Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        
-
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public PduJoinMapBase(uint joinStart)
-            :base(joinStart, typeof(PduJoinMapBase))
-        {   
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        public PduJoinMapBase(uint joinStart, Type type)
-            : base(joinStart, type)
-        {            
-        }
-    }
-}

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

@@ -398,22 +398,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Digital
 			});
 
-        [JoinName("DirectoryClearSelection")]
-        public JoinDataComplete DirectoryClearSelection = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 100,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Directory Search Busy FB",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-
-
 		[JoinName("DirectoryEntryIsContact")]
 		public JoinDataComplete DirectoryEntryIsContact = new JoinDataComplete(
 			new JoinData
@@ -1272,12 +1256,11 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 			},
 			new JoinMetadata
 			{
-				Description = "Directory Select Row and Feedback",
+				Description = "Directory Select Row",
 				JoinCapabilities = eJoinCapabilities.FromSIMPL,
 				JoinType = eJoinType.Analog
 			});
 
-
         [JoinName("SelectedContactMethodCount")]
         public JoinDataComplete SelectedContactMethodCount = new JoinDataComplete(
             new JoinData
@@ -1306,22 +1289,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
                 JoinType = eJoinType.Analog
             });
 
-        [JoinName("DirectorySelectRowFeedback")]
-        public JoinDataComplete DirectorySelectRowFeedback = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 104,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Directory Select Row and Feedback",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Analog
-            });
-
-
-
 		[JoinName("CameraPresetSelect")]
 		public JoinDataComplete CameraPresetSelect = new JoinDataComplete(
 			new JoinData
@@ -1609,36 +1576,6 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("AvailableLayoutsFb")]
-        public JoinDataComplete AvailableLayoutsFb = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 142,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "xSig of all available layouts",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SelectLayout")]
-        public JoinDataComplete SelectLayout = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 142,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Select Layout by string",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-
-
 		[JoinName("CurrentParticipants")]
 		public JoinDataComplete CurrentParticipants = new JoinDataComplete(
 			new JoinData
@@ -3077,35 +3014,6 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
 				JoinType = eJoinType.Serial
 			});
 
-        [JoinName("AvailableLayoutsFb")]
-        public JoinDataComplete AvailableLayoutsFb = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 142,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "xSig of all available layouts",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("SelectLayout")]
-        public JoinDataComplete SelectLayout = new JoinDataComplete(
-            new JoinData
-            {
-                JoinNumber = 142,
-                JoinSpan = 1
-            },
-            new JoinMetadata
-            {
-                Description = "Select Layout by string",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-
 		[JoinName("CurrentParticipants")]
 		public JoinDataComplete CurrentParticipants = new JoinDataComplete(
 			new JoinData

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

@@ -1,35 +1,35 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.Config
-{
-    public class DeviceConfig
-    {
-        [JsonProperty("key")]
-        public string Key { get; set; }
-
-        [JsonProperty("uid")]
-        public int Uid { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("group")]
-        public string Group { get; set; }
-
-        [JsonProperty("type")]
-        public string Type { get; set; }
-
-        [JsonProperty("properties")]
-        [JsonConverter(typeof(DevicePropertiesConverter))]
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core.Config
+{
+    public class DeviceConfig
+    {
+        [JsonProperty("key")]
+        public string Key { get; set; }
+
+        [JsonProperty("uid")]
+        public int Uid { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("group")]
+        public string Group { get; set; }
+
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(DevicePropertiesConverter))]
         public JToken Properties { get; set; }
 
         public DeviceConfig(DeviceConfig dc)
@@ -39,42 +39,39 @@ namespace PepperDash.Essentials.Core.Config
             Name = dc.Name;
             Group = dc.Group;
             Type = dc.Type;
-
-            Properties = JToken.Parse(dc.Properties.ToString());
-
-            //Properties = JToken.FromObject(dc.Properties);
+            Properties = JToken.FromObject(dc.Properties);
         }
 
         public DeviceConfig() {}
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public class DevicePropertiesConverter : JsonConverter
-    {
-
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(JToken);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return JToken.ReadFrom(reader);
-        }
-
-        public override bool CanWrite
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            throw new NotImplementedException("SOD OFF HOSER");
-        }
-    }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class DevicePropertiesConverter : JsonConverter
+    {
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(JToken);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            return JToken.ReadFrom(reader);
+        }
+
+        public override bool CanWrite
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException("SOD OFF HOSER");
+        }
+    }
 }

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

@@ -66,7 +66,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
         #endregion
     }
 
-    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2NIoController>
+    public class C2NIoControllerFactory : EssentialsDeviceFactory<C2nRthsController>
     {
         public C2NIoControllerFactory()
         {

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

@@ -131,15 +131,4 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public string MinimumEssentialsFrameworkVersion { get; protected set; }
     }
-
-    public abstract class EssentialsPluginDevelopmentDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDevelopmentDeviceFactory where T : EssentialsDevice
-    {
-        /// <summary>
-        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
-        /// </summary>
-        public string MinimumEssentialsFrameworkVersion { get; protected set; }
-
-        public List<string>  DevelopmentEssentialsFrameworkVersions { get; protected set; }
-    }
-
 }

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

@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash_Essentials_Core.Devices
-{
-    /// <summary>
-    /// Interface for any device that is able to control it'spower and has a configurable reboot time
-    /// </summary>
-    public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback
-    {
-        /// <summary>
-        /// Delay between power off and power on for reboot
-        /// </summary>
-        int PowerCycleTimeMs { get;}
-
-        /// <summary>
-        /// Reboot outlet
-        /// </summary>
-        void PowerCycle();
-    }
-
-    /// <summary>
-    /// Interface for any device that contains a collection of IHasPowerReboot Devices
-    /// </summary>
-    public interface IHasControlledPowerOutlets : IKeyName
-    {
-        /// <summary>
-        /// Collection of IPduOutlets
-        /// </summary>
-        ReadOnlyDictionary<int, IHasPowerCycle> PduOutlets { get; }
-
-    }
-}

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

@@ -59,7 +59,7 @@ namespace PepperDash.Essentials.Core.Devices
         /// <summary>
         /// Used by the extending class to allow for any custom actions to be taken (tell the ConfigWriter to write config, etc)
         /// </summary>
-        /// <param name="config"></param>
+        /// <param name="Config"></param>
         protected virtual void CustomSetConfig(DeviceConfig config)
         {
             ConfigWriter.UpdateDeviceConfig(config);

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

@@ -105,6 +105,9 @@ namespace PepperDash.Essentials.Core
 	    protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, uint joinStart, string joinMapKey,
 	        EiscApiAdvanced bridge)
 	    {
+            var inputNumber = 0;
+	        var inputKeys = new List<string>();
+
             var joinMap = new DisplayControllerJoinMap(joinStart);
 
             var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
@@ -121,141 +124,133 @@ namespace PepperDash.Essentials.Core
 	            Debug.Console(0,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
 	        }
 
-			LinkDisplayToApi(displayDevice, trilist, joinMap);
+	        Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+            Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
+
+            trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
+
+            var commMonitor = displayDevice as ICommunicationMonitor;
+            if (commMonitor != null)
+            {
+                commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+            }
+
+            var inputNumberFeedback = new IntFeedback(() => inputNumber);
+
+            // Two way feedbacks
+            var twoWayDisplay = displayDevice as TwoWayDisplayBase;
+
+            if (twoWayDisplay != null)
+            {
+                trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
+
+                twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
+
+
+                inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
+            }
+
+            // Power Off
+            trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
+            {
+                inputNumber = 102;
+                inputNumberFeedback.FireUpdate();
+                displayDevice.PowerOff();
+            });
+
+            var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
+            if (twoWayDisplayDevice != null)
+            {
+                twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
+                {
+                    if (!a.BoolValue)
+                    {
+                        inputNumber = 102;
+                        inputNumberFeedback.FireUpdate();
+
+                    }
+                    else
+                    {
+                        inputNumber = 0;
+                        inputNumberFeedback.FireUpdate();
+                    }
+                };
+
+                twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
+                twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
+            }
+
+            // PowerOn
+            trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
+            {
+                inputNumber = 0;
+                inputNumberFeedback.FireUpdate();
+                displayDevice.PowerOn();
+            });
+
+
+
+            for (int i = 0; i < displayDevice.InputPorts.Count; i++)
+            {
+                if (i < joinMap.InputNamesOffset.JoinSpan)
+                {
+                    inputKeys.Add(displayDevice.InputPorts[i].Key);
+                    var tempKey = inputKeys.ElementAt(i);
+                    trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
+                        () => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
+                    Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
+                        joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
+                    trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
+                }
+                else
+                    Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
+                        displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
+            }
+
+            Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
+            trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
+            {
+                if (a == 0)
+                {
+                    displayDevice.PowerOff();
+                    inputNumber = 0;
+                }
+                else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
+                {
+                    displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
+                    inputNumber = a;
+                }
+                else if (a == 102)
+                {
+                    displayDevice.PowerToggle();
+
+                }
+                if (twoWayDisplay != null)
+                    inputNumberFeedback.FireUpdate();
+            });
+
+
+            var volumeDisplay = displayDevice as IBasicVolumeControls;
+	        if (volumeDisplay == null) return;
+
+	        trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
+            trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
+            trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
+
+	        var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
+
+	        if (volumeDisplayWithFeedback == null) return;
+            trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
+            trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
+
+
+            trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
+            volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
+            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
+            volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
+            volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
 	    }
 
-		protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
-		{
-			Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-			Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
-
-			trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
-
-			var commMonitor = displayDevice as ICommunicationMonitor;
-			if (commMonitor != null)
-			{
-				commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-			}
-
-			var inputNumber = 0;
-			var inputKeys = new List<string>();
-
-			var inputNumberFeedback = new IntFeedback(() => inputNumber);
-
-			// Two way feedbacks
-			var twoWayDisplay = displayDevice as TwoWayDisplayBase;
-
-			if (twoWayDisplay != null)
-			{
-				trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
-
-				twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
-
-
-				inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
-			}
-
-			// Power Off
-			trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () =>
-			{
-				inputNumber = 102;
-				inputNumberFeedback.FireUpdate();
-				displayDevice.PowerOff();
-			});
-
-			var twoWayDisplayDevice = displayDevice as TwoWayDisplayBase;
-			if (twoWayDisplayDevice != null)
-			{
-				twoWayDisplayDevice.PowerIsOnFeedback.OutputChange += (o, a) =>
-				{
-					if (!a.BoolValue)
-					{
-						inputNumber = 102;
-						inputNumberFeedback.FireUpdate();
-
-					}
-					else
-					{
-						inputNumber = 0;
-						inputNumberFeedback.FireUpdate();
-					}
-				};
-
-				twoWayDisplayDevice.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
-				twoWayDisplayDevice.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
-			}
-
-			// PowerOn
-			trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () =>
-			{
-				inputNumber = 0;
-				inputNumberFeedback.FireUpdate();
-				displayDevice.PowerOn();
-			});
-
-
-
-			for (int i = 0; i < displayDevice.InputPorts.Count; i++)
-			{
-				if (i < joinMap.InputNamesOffset.JoinSpan)
-				{
-					inputKeys.Add(displayDevice.InputPorts[i].Key);
-					var tempKey = inputKeys.ElementAt(i);
-					trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
-						() => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
-					Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
-						joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
-					trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
-				}
-				else
-					Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs.  The Join Map allows up to {1} inputs.  Discarding inputs {2} - {3} from bridge.",
-						displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
-			}
-
-			Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
-			trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
-			{
-				if (a == 0)
-				{
-					displayDevice.PowerOff();
-					inputNumber = 0;
-				}
-				else if (a > 0 && a < displayDevice.InputPorts.Count && a != inputNumber)
-				{
-					displayDevice.ExecuteSwitch(displayDevice.InputPorts.ElementAt(a - 1).Selector);
-					inputNumber = a;
-				}
-				else if (a == 102)
-				{
-					displayDevice.PowerToggle();
-
-				}
-				if (twoWayDisplay != null)
-					inputNumberFeedback.FireUpdate();
-			});
-
-
-			var volumeDisplay = displayDevice as IBasicVolumeControls;
-			if (volumeDisplay == null) return;
-
-			trilist.SetBoolSigAction(joinMap.VolumeUp.JoinNumber, volumeDisplay.VolumeUp);
-			trilist.SetBoolSigAction(joinMap.VolumeDown.JoinNumber, volumeDisplay.VolumeDown);
-			trilist.SetSigTrueAction(joinMap.VolumeMute.JoinNumber, volumeDisplay.MuteToggle);
-
-			var volumeDisplayWithFeedback = volumeDisplay as IBasicVolumeWithFeedback;
-
-			if (volumeDisplayWithFeedback == null) return;
-			trilist.SetSigTrueAction(joinMap.VolumeMuteOn.JoinNumber, volumeDisplayWithFeedback.MuteOn);
-			trilist.SetSigTrueAction(joinMap.VolumeMuteOff.JoinNumber, volumeDisplayWithFeedback.MuteOff);
-
-
-			trilist.SetUShortSigAction(joinMap.VolumeLevel.JoinNumber, volumeDisplayWithFeedback.SetVolume);
-			volumeDisplayWithFeedback.VolumeLevelFeedback.LinkInputSig(trilist.UShortInput[joinMap.VolumeLevel.JoinNumber]);
-			volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMute.JoinNumber]);
-			volumeDisplayWithFeedback.MuteFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VolumeMuteOn.JoinNumber]);
-			volumeDisplayWithFeedback.MuteFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.VolumeMuteOff.JoinNumber]);
-		}
-
     }
 
 	/// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/File/FileIO.cs

@@ -15,12 +15,19 @@ namespace PepperDash.Essentials.Core
 		static CCriticalSection fileLock = new CCriticalSection();
 		public delegate void GotFileEventHandler(object sender, FileEventArgs e);
 		public static event GotFileEventHandler GotFileEvent;
-
+		private static Dictionary<string, CTimer> WriteTimers;
+		public const long WriteTimeout = 5000;
 		/// <summary>
 		/// Get the full file info from a path/filename, can include wildcards.
 		/// </summary>
 		/// <param name="fileName"></param>
 		/// <returns></returns>
+		/// 
+		static FileIO() 
+		{
+			WriteTimers = new Dictionary<string, CTimer>();
+		}
+
 		public static FileInfo[] GetFiles(string fileName)
 		{
 			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
@@ -35,7 +42,7 @@ namespace PepperDash.Essentials.Core
 				return null;
 			}
 		}
-
+		
 		public static FileInfo GetFile(string fileName)
 		{
 			DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fileName));
@@ -81,7 +88,6 @@ namespace PepperDash.Essentials.Core
 			{
 				if (fileLock.TryEnter())
 				{
-					DirectoryInfo dirInfo = new DirectoryInfo(file.Name);
 					Debug.Console(2, "FileIO Getting Data {0}", file.FullName);
 
 					if (File.Exists(file.FullName))
@@ -169,7 +175,8 @@ namespace PepperDash.Essentials.Core
 				}
 				else
 				{
-					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock");
+					Debug.Console(0, Debug.ErrorLogLevel.Error, "FileIO Unable to enter FileLock retrying");
+
 				}
 
 			}
@@ -189,6 +196,41 @@ namespace PepperDash.Essentials.Core
 
 		}
 
+		/// <summary>
+		/// Resets (or starts) the write timer
+		/// </summary>
+		static void ResetTimer(string data, string filePath)
+		{
+			try
+			{
+				if (WriteTimers.ContainsKey(filePath))
+				{
+					WriteTimers[filePath].Stop();
+					WriteTimers[filePath] = null;
+					WriteTimers.Remove(filePath);
+				}
+				WriteTimers.Add(filePath, new CTimer((o) => 
+					{
+						Thread _WriteFileThread;
+						_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
+						_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
+						_WriteFileThread.Start();
+						Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
+						WriteTimers.Remove(filePath);
+					}, WriteTimeout));
+
+				
+
+				Debug.Console(0, "FileIO write timer has been reset.");
+			}
+			catch (Exception e)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Error: FileIO ResetTimer failed: \r{0}", e);
+				data = "";
+			}
+		}
+
+
 		/// <summary>
 		/// 
 		/// </summary>
@@ -201,11 +243,7 @@ namespace PepperDash.Essentials.Core
 		/// <param name="filePath"></param>
 		public static void WriteDataToFile(string data, string filePath)
 		{
-			Thread _WriteFileThread;
-			_WriteFileThread = new Thread((O) => _WriteFileMethod(data, filePath), null, Thread.eThreadStartOptions.CreateSuspended);
-			_WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority;
-			_WriteFileThread.Start();
-			Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WriteFile Thread");
+			ResetTimer(data, filePath);
 
 		}
 
@@ -240,6 +278,7 @@ namespace PepperDash.Essentials.Core
 					fileLock.Leave();
 
 			}
+			Debug.Console(0, Debug.ErrorLogLevel.Notice, "File Written to	: '{0}'", filePath);
 			return null;
 
 		}

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

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Text.RegularExpressions;
 using System.Globalization;
 using Crestron.SimplSharp;
@@ -123,38 +122,6 @@ namespace PepperDash.Essentials.Core
             AssemblyVersion = assemblyVersion;
         }
 
-	    public static bool IsRunningDevelopmentVersion(List<string> developmentVersions, string minimumVersion)
-	    {
-	        if (Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*").Groups[1].Value == "0")
-	        {
-                Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
-                return true;
-	        }
-
-	        if (developmentVersions == null)
-	        {
-	            Debug.Console(0, 
-                    "Development Plugin does not specify a list of versions.  Loading plugin may not work as expected.  Checking Minumum version");
-                return IsRunningMinimumVersionOrHigher(minimumVersion);
-	        }
-
-            Debug.Console(2, "Comparing running version '{0}' to minimum versions '{1}'", AssemblyVersion, developmentVersions);
-
-	        var versionMatch = developmentVersions.FirstOrDefault(x => x == AssemblyVersion);
-
-	        if (String.IsNullOrEmpty(versionMatch))
-	        {
-	            Debug.Console(0, "Essentials Build does not match any builds required for plugin load.  Bypassing Plugin Load.");
-	            return false;
-	        }
-
-            Debug.Console(2, "Essentials Build {0} matches list of development builds", AssemblyVersion);
-	        return IsRunningMinimumVersionOrHigher(minimumVersion);
-
-
-
-	    }
-
         /// <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>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Lighting/LightingBase.cs

@@ -70,69 +70,50 @@ namespace PepperDash.Essentials.Core.Lighting
             }
         }
 
-	    protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
-		    string joinMapKey, EiscApiAdvanced bridge)
-	    {
-			var joinMap = new GenericLightingJoinMap(joinStart);
-
-			var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
-
-			if (!string.IsNullOrEmpty(joinMapSerialized))
-				joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
-
-			if (bridge != null)
-			{
-				bridge.AddJoinMap(Key, joinMap);
-			}
-			else
-			{
-				Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-			}
-
-		    return LinkLightingToApi(lightingDevice, trilist, joinMap);
-	    }
-
-      protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, GenericLightingJoinMap joinMap)
-      {
-        Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
-
-        Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
-
-        // GenericLighitng Actions & FeedBack
-        trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
-
-        var sceneIndex = 0;
-        foreach (var scene in lightingDevice.LightingScenes)
+        protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, uint joinStart,
+            string joinMapKey, EiscApiAdvanced bridge)
         {
-          var index = sceneIndex;
+            var joinMap = new GenericLightingJoinMap(joinStart);
 
-          trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + index), () => lightingDevice.SelectScene(lightingDevice.LightingScenes[index]));
-          scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)]);
-          trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
-          trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
 
-          sceneIndex++;
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            }
+
+            Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
+
+            // GenericLighitng Actions & FeedBack
+            trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));
+
+            var sceneIndex = 0;
+            foreach (var scene in lightingDevice.LightingScenes)
+            {
+                var index1 = sceneIndex;
+                trilist.SetSigTrueAction((uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex), () =>
+                {
+                    var index = index1;
+                    Debug.Console(2, this, "LightingDevice: sceneIndex: {0} index: {1} > inside action", index1, index);
+                    lightingDevice.SelectScene(lightingDevice.LightingScenes[index]);
+                });
+                scene.IsActiveFeedback.LinkInputSig(trilist.BooleanInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)]);
+                trilist.StringInput[(uint)(joinMap.SelectSceneDirect.JoinNumber + sceneIndex)].StringValue = scene.Name;
+                trilist.BooleanInput[(uint)(joinMap.ButtonVisibility.JoinNumber + sceneIndex)].BoolValue = true;
+                sceneIndex++;
+            }
+            return joinMap;
         }
 
-        trilist.OnlineStatusChange += (sender, args) =>
-        {
-          if (!args.DeviceOnLine) return;
-
-          sceneIndex = 0;
-          foreach (var scene in lightingDevice.LightingScenes)
-          {
-            var index = sceneIndex;
-
-            trilist.StringInput[(uint) (joinMap.SelectSceneDirect.JoinNumber + index)].StringValue = scene.Name;
-            trilist.BooleanInput[(uint) (joinMap.ButtonVisibility.JoinNumber + index)].BoolValue = true;
-            scene.IsActiveFeedback.FireUpdate();
-
-            sceneIndex++;
-          }
-        };
-
-        return joinMap;
-      }
     }
 
     public class LightingScene

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

@@ -123,7 +123,6 @@
     <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
-    <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />
     <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\CameraControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\CenOdtOccupancySensorBaseJoinMap.cs" />
@@ -204,7 +203,6 @@
     <Compile Include="Devices\IReconfigurableDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
-    <Compile Include="Devices\PduInterfaces.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
     <Compile Include="DeviceTypeInterfaces\IPasswordPrompt.cs" />
@@ -338,9 +336,7 @@
     <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
     <Compile Include="Routing\RoutingPortNames.cs" />
     <Compile Include="Routing\TieLineConfig.cs" />
-    <Compile Include="Secrets\CrestronGlobalSecretsProvider.cs" />
-    <Compile Include="Secrets\CrestronLocalSecretsProvider.cs" />
-    <Compile Include="Secrets\CrestronSecret.cs" />
+    <Compile Include="Secrets\CrestronSecretsProvider.cs" />
     <Compile Include="Secrets\Interfaces.cs" />
     <Compile Include="Secrets\SecretsManager.cs" />
     <Compile Include="Secrets\SecretsPropertiesConfig.cs" />

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

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using PepperDash.Core;
 
 
@@ -16,10 +15,5 @@ namespace PepperDash.Essentials.Core
 
     }
 
-    public interface IPluginDevelopmentDeviceFactory : IPluginDeviceFactory
-    {
-        List<string> DevelopmentEssentialsFrameworkVersions { get; }
-    }
-}
-
 
+}

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

@@ -425,11 +425,7 @@ namespace PepperDash.Essentials
         /// <param name="loadedAssembly"></param>
         static void LoadCustomPlugin(IPluginDeviceFactory plugin, LoadedAssembly loadedAssembly)
         {
-            var developmentPlugin = plugin as IPluginDevelopmentDeviceFactory;
-
-            var passed = developmentPlugin != null ? Global.IsRunningDevelopmentVersion
-                (developmentPlugin.DevelopmentEssentialsFrameworkVersions, developmentPlugin.MinimumEssentialsFrameworkVersion) 
-                : Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
+            var passed = Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
 
             if (!passed)
             {

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

@@ -25,7 +25,7 @@ namespace PepperDash.Essentials.Core
 			Type = type;
 			ConnectionType = connType;
 			Selector = selector;
-			IsInternal = isInternal;
+			IsInternal = IsInternal;
 		}
 	}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronGlobalSecretsProvider.cs

@@ -1,102 +0,0 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class CrestronGlobalSecretsProvider : ISecretProvider
-    {
-        public string Key { get; set; }
-        //Added for reference
-        public string Description { get; private set; }
-
-        public CrestronGlobalSecretsProvider(string key)
-        {
-            Key = key;
-            Description = String.Format("Default secret provider serving all local applications");
-
-        }
-
-        static CrestronGlobalSecretsProvider()
-        {
-            //Added for future encrypted reference
-            var secureSupported = CrestronSecureStorage.Supported;
-
-            CrestronDataStoreStatic.InitCrestronDataStore();
-            if (secureSupported)
-            {
-                //doThingsFuture
-            }
-        }
-
-        /// <summary>
-        /// Set secret for item in the CrestronSecretsProvider
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <param name="value">Secret Value</param>
-        public bool SetSecret(string key, object value)
-        {
-            var secret = value as string;
-            CrestronDataStore.CDS_ERROR returnCode;
-
-            if (String.IsNullOrEmpty(secret))
-            {
-                returnCode = CrestronDataStoreStatic.clearGlobal(key);
-                if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                {
-                    Debug.Console(0, this, "Successfully removed secret \"{0}\"", secret);
-                    return true;
-                }
-            }
-
-            else
-            {
-                returnCode = CrestronDataStoreStatic.SetGlobalStringValue(key, secret);
-                if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                {
-                    Debug.Console(0, this, "Successfully set secret \"{0}\"", secret);
-                    return true;
-                }
-            }
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, returnCode.ToString());
-            return false;
-        }
-
-        /// <summary>
-        /// Retrieve secret for item in the CrestronSecretsProvider
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <returns>ISecret Object containing key, provider, and value</returns>
-        public ISecret GetSecret(string key)
-        {
-            string mySecret;
-            var getErrorCode = CrestronDataStoreStatic.GetGlobalStringValue(key, out mySecret);
-
-            switch (getErrorCode)
-            {
-                case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
-                    Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
-                    return new CrestronSecret(key, mySecret, this);
-                default:
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
-                        Key, key, getErrorCode.ToString());
-                    return null;
-            }
-        }
-
-        /// <summary>
-        /// Determine if a secret is present within the provider without retrieving it
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <returns>bool if present</returns>
-        public bool TestSecret(string key)
-        {
-            string mySecret;
-            return CrestronDataStoreStatic.GetGlobalStringValue(key, out mySecret) == CrestronDataStore.CDS_ERROR.CDS_SUCCESS;
-        }
-    }
-
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecret.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Special container class for CrestronSecret provider
-    /// </summary>
-    public class CrestronSecret : ISecret
-    {
-        public ISecretProvider Provider { get; private set; }
-        public string Key { get; private set; }
-
-        public object Value { get; private set; }
-
-        public CrestronSecret(string key, string value, ISecretProvider provider)
-        {
-            Key = key;
-            Value = value;
-            Provider = provider;
-        }
-
-    }
-
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecretsProvider.cs

@@ -1,103 +1,97 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
-using PepperDash.Core;
-using Crestron.SimplSharpPro;
-
-
-namespace PepperDash.Essentials.Core
-{
-    public class CrestronLocalSecretsProvider : ISecretProvider
-    {
-        public string Key { get; set; }
-        //Added for reference
-        public string Description { get; private set; }
-
-
-        public CrestronLocalSecretsProvider(string key)
-        {
-            Key = key;
-            Description = String.Format("Default secret provider serving Essentials Application {0}", InitialParametersClass.ApplicationNumber);
-        }
-
-        static CrestronLocalSecretsProvider()
-        {
-            //Added for future encrypted reference
-            var secureSupported = CrestronSecureStorage.Supported;
-
-            CrestronDataStoreStatic.InitCrestronDataStore();
-            if (secureSupported)
-            {
-                //doThingsFuture
-            }
-        }
-
-        /// <summary>
-        /// Set secret for item in the CrestronSecretsProvider
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <param name="value">Secret Value</param>
-        public bool SetSecret(string key, object value)
-        {
-            var secret = value as string;
-            CrestronDataStore.CDS_ERROR returnCode;
-
-            if (String.IsNullOrEmpty(secret))
-            {
-                returnCode = CrestronDataStoreStatic.clearLocal(key);
-                if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                {
-                    Debug.Console(0, this, "Successfully removed secret \"{0}\"", secret);
-                    return true;
-                }
-            }
-
-            else  
-            {
-                returnCode = CrestronDataStoreStatic.SetLocalStringValue(key, secret);
-                if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
-                {
-                    Debug.Console(0, this, "Successfully set secret \"{0}\"", secret);
-                    return true;
-                }
-            }
-
-            Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, returnCode.ToString());
-            return false; 
-        }
-
-        /// <summary>
-        /// Retrieve secret for item in the CrestronSecretsProvider
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <returns>ISecret Object containing key, provider, and value</returns>
-        public ISecret GetSecret(string key)
-        {
-            string mySecret;
-            var getErrorCode = CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret);
-
-            switch (getErrorCode)
-            {
-                case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
-                    Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
-                    return new CrestronSecret(key, mySecret, this);
-                default:
-                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
-                        Key, key, getErrorCode.ToString());
-                    return null;
-            }
-        }
-
-        /// <summary>
-        /// Determine if a secret is present within the provider without retrieving it
-        /// </summary>
-        /// <param name="key">Secret Key</param>
-        /// <returns>bool if present</returns>
-        public bool TestSecret(string key)
-        {
-            string mySecret;
-            return CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret) == CrestronDataStore.CDS_ERROR.CDS_SUCCESS;
-        }
-    }
-
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronDataStore;
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+    public class CrestronSecretsProvider : ISecretProvider
+    {
+        public string Key { get; set; }
+        //Added for reference
+        private static readonly bool SecureSupported;
+        public CrestronSecretsProvider(string key)
+        {
+            Key = key;
+        }
+
+        static CrestronSecretsProvider()
+        {
+            //Added for future encrypted reference
+            SecureSupported = CrestronSecureStorage.Supported;
+
+            CrestronDataStoreStatic.InitCrestronDataStore();
+            if (SecureSupported)
+            {
+                //doThingsFuture
+            }
+        }
+
+        /// <summary>
+        /// Set secret for item in the CrestronSecretsProvider
+        /// </summary>
+        /// <param name="key">Secret Key</param>
+        /// <param name="value">Secret Value</param>
+        public bool SetSecret(string key, object value)
+        {
+            var secret = value as string;
+            if (String.IsNullOrEmpty(secret))
+            {
+                Debug.Console(2, this, "Unable to set secret for {0}:{1} - value is empty.", Key, key);
+                return false;
+            }
+            var setErrorCode = CrestronDataStoreStatic.SetLocalStringValue(key, secret);
+            switch (setErrorCode)
+            {
+                case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
+                    Debug.Console(1, this,"Secret Successfully Set for {0}:{1}", Key, key);
+                    return true;
+                default:
+                    Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, setErrorCode.ToString());
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Retrieve secret for item in the CrestronSecretsProvider
+        /// </summary>
+        /// <param name="key">Secret Key</param>
+        /// <returns>ISecret Object containing key, provider, and value</returns>
+        public ISecret GetSecret(string key)
+        {
+            string mySecret;
+            var getErrorCode = CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret);
+
+            switch (getErrorCode)
+            {
+                case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
+                    Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
+                    return new CrestronSecret(key, mySecret, this);
+                default:
+                    Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
+                        Key, key, getErrorCode.ToString());
+                    return null;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Special container class for CrestronSecret provider
+    /// </summary>
+    public class CrestronSecret : ISecret
+    {
+        public ISecretProvider Provider { get; private set; }
+        public string Key { get; private set; }
+
+        public object Value { get; private set; }
+
+        public CrestronSecret(string key, string value, ISecretProvider provider)
+        {
+            Key = key;
+            Value = value;
+            Provider = provider;
+        }
+
+    }
 }

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

@@ -7,32 +7,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface ISecretProvider : IKeyed
     {
-        /// <summary>
-        /// Set secret value for provider by key
-        /// </summary>
-        /// <param name="key">key of secret to set</param>
-        /// <param name="value">value to set secret to</param>
-        /// <returns></returns>
         bool SetSecret(string key, object value);
 
-        /// <summary>
-        /// Return object containing secret from provider
-        /// </summary>
-        /// <param name="key">key of secret to retrieve</param>
-        /// <returns></returns>
         ISecret GetSecret(string key);
-
-        /// <summary>
-        /// Verifies presence of secret
-        /// </summary>
-        /// <param name="key">key of secret to chek</param>
-        /// <returns></returns>
-        bool TestSecret(string key);
-
-        /// <summary>
-        /// Description of the secrets provider
-        /// </summary>
-        string Description { get; }
     }
 
     /// <summary>
@@ -40,19 +17,8 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface ISecret
     {
-        /// <summary>
-        /// Instance of ISecretProvider that the secret belongs to
-        /// </summary>
         ISecretProvider Provider { get; }
-
-        /// <summary>
-        /// Key of the secret in the provider
-        /// </summary>
         string Key { get; }
-
-        /// <summary>
-        /// Value of the secret
-        /// </summary>
         object Value { get; }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsManager.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 
+
 namespace PepperDash.Essentials.Core
 {
     public static class SecretsManager
@@ -16,28 +16,18 @@ namespace PepperDash.Essentials.Core
         public static void Initialize()
         {
 
-            AddSecretProvider("default", new CrestronLocalSecretsProvider("default"));
-
-            AddSecretProvider("CrestronGlobalSecrets", new CrestronGlobalSecretsProvider("CrestronGlobalSecrets"));
+            AddSecretProvider("default", new CrestronSecretsProvider("default"));
 
             CrestronConsole.AddNewConsoleCommand(SetSecretProcess, "setsecret",
-                "Adds secret to secrets provider",
+                "Adds secrets to secret provider",
                 ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(UpdateSecretProcess, "updatesecret",
-                "Updates secret in secrets provider",
+                "Updates secrets in secret provider",
                 ConsoleAccessLevelEnum.AccessAdministrator);
 
             CrestronConsole.AddNewConsoleCommand(DeleteSecretProcess, "deletesecret",
-                "Deletes secret from secrest provider",
-                ConsoleAccessLevelEnum.AccessAdministrator);
-
-            CrestronConsole.AddNewConsoleCommand(ListProviders, "secretproviderlist",
-                "Return list of all valid secrets providers",
-                ConsoleAccessLevelEnum.AccessAdministrator);
-
-            CrestronConsole.AddNewConsoleCommand(GetProviderInfo, "secretproviderinfo",
-                "Return data about secrets provider",
+                "Deletes secrets in secret provider",
                 ConsoleAccessLevelEnum.AccessAdministrator);
         }
 
@@ -64,79 +54,6 @@ namespace PepperDash.Essentials.Core
             return secret;
         }
 
-        public static void GetProviderInfo(string cmd)
-        {
-            string response;
-            var args = cmd.Split(' ');
-
-            if (cmd.Length == 0 || (args.Length == 1 && args[0] == "?"))
-            {
-                response = "Returns data about secrets provider.  Format 'secretproviderinfo <provider>'";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            if (args.Length == 1)
-            {
-                var provider = GetSecretProviderByKey(args[0]);
-
-                if (provider == null)
-                {
-                    response = "Invalid secrets provider key";
-                    CrestronConsole.ConsoleCommandResponse(response);
-                    return;
-                }
-
-                response = String.Format("{0} : {1}", provider.Key, provider.Description);
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-            response = "Improper number of arguments";
-            CrestronConsole.ConsoleCommandResponse(response);
-
-        }
-
-
-        /// <summary>
-        /// Console Command that returns all valid secrets in the essentials program.
-        /// </summary>
-        /// <param name="cmd"></param>
-        public static void ListProviders(string cmd)
-        {
-            var response = String.Empty;
-            var args = cmd.Split(' ');
-
-            if (cmd.Length == 0)
-            {
-                if (Secrets != null && Secrets.Count > 0)
-                {
-                    response = Secrets.Aggregate(response,
-                        (current, secretProvider) => current + (secretProvider.Key + "\n\r"));
-                }
-                else
-                {
-                    response = "No Secrets Providers Available";
-                }
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-
-            }
-
-            if (args.Length == 1 && args[0] == "?")
-            {
-                response = "Reports all valid and preset Secret providers";
-                CrestronConsole.ConsoleCommandResponse(response);
-                return;
-            }
-
-
-            response = "Improper number of arguments";
-            CrestronConsole.ConsoleCommandResponse(response);
-
-        }
-
         /// <summary>
         /// Add secret provider to secrets dictionary
         /// </summary>
@@ -183,14 +100,14 @@ namespace PepperDash.Essentials.Core
             if (args.Length == 0)
             {
                 //some Instructional Text
-                response = "Adds secrets to secret provider. Format 'setsecret <provider> <secretKey> <secret>'";
+                response = "Adds secrets to secret provider. Format 'setsecret <provider> <secretKey> <secret>";
                 CrestronConsole.ConsoleCommandResponse(response);
                 return;
             }
 
             if (args.Length == 1 && args[0] == "?")
             {
-                response = "Adds secrets to secret provider. Format 'setsecret <provider> <secretKey> <secret>'";
+                response = "Adds secrets to secret provider. Format 'setsecret <provider> <secretKey> <secret>";
                 CrestronConsole.ConsoleCommandResponse(response);
                 return;
             }
@@ -217,7 +134,23 @@ namespace PepperDash.Essentials.Core
             var key = args[1];
             var secret = args[2];
 
-            CrestronConsole.ConsoleCommandResponse(SetSecret(provider, key, secret));
+            if (provider.GetSecret(key) == null)
+            {
+
+                response = provider.SetSecret(key, secret)
+                    ? String.Format(
+                        "Secret successfully set for {0}:{1}",
+                        provider.Key, key)
+                    : String.Format(
+                        "Unable to set secret for {0}:{1}",
+                        provider.Key, key);                    
+                CrestronConsole.ConsoleCommandResponse(response);
+                return;
+            }
+            response =
+                String.Format(
+                    "Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
+            CrestronConsole.ConsoleCommandResponse(response);
         }
 
         private static void UpdateSecretProcess(string cmd)
@@ -228,7 +161,7 @@ namespace PepperDash.Essentials.Core
             if (args.Length == 0)
             {
                 //some Instructional Text
-                response = "Updates secrets in secret provider. Format 'updatesecret <provider> <secretKey> <secret>'";
+                response = "Updates secrets in secret provider. Format 'updatesecret <provider> <secretKey> <secret>";
                 CrestronConsole.ConsoleCommandResponse(response);
                 return;
 
@@ -236,7 +169,7 @@ namespace PepperDash.Essentials.Core
 
             if (args.Length == 1 && args[0] == "?")
             {
-                response = "Updates secrets in secret provider. Format 'updatesecret <provider> <secretKey> <secret>'";
+                response = "Updates secrets in secret provider. Format 'updatesecret <provider> <secretKey> <secret>";
                 CrestronConsole.ConsoleCommandResponse(response);
                 return;
             }
@@ -265,49 +198,23 @@ namespace PepperDash.Essentials.Core
             var key = args[1];
             var secret = args[2];
 
-            CrestronConsole.ConsoleCommandResponse(UpdateSecret(provider, key, secret));
-
-        }
-
-        private static string UpdateSecret(ISecretProvider provider, string key, string secret)
-        {
-            var secretPresent = provider.TestSecret(key);
-
-            Debug.Console(2, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
-
-            if (!secretPresent)
-                return
-                    String.Format(
-                        "Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to modify it");
-            var response = provider.SetSecret(key, secret)
-                ? String.Format(
-                    "Secret successfully set for {0}:{1}",
-                    provider.Key, key)
-                : String.Format(
-                    "Unable to set secret for {0}:{1}",
-                    provider.Key, key);
-            return response;
-        }
-
-        private static string SetSecret(ISecretProvider provider, string key, string secret)
-        {
-            var secretPresent = provider.TestSecret(key);
-
-            Debug.Console(2, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
-
-            if (secretPresent)
-                return
-                    String.Format(
-                        "Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
-            var response = provider.SetSecret(key, secret)
-                ? String.Format(
-                    "Secret successfully set for {0}:{1}",
-                    provider.Key, key)
-                : String.Format(
-                    "Unable to set secret for {0}:{1}",
-                    provider.Key, key);
-            return response;
+            if (provider.GetSecret(key) != null)
+            {
+                response = provider.SetSecret(key, secret)
+                    ? String.Format(
+                        "Secret successfully set for {0}:{1}",
+                        provider.Key, key)
+                    : String.Format(
+                        "Unable to set secret for {0}:{1}",
+                        provider.Key, key);
+                CrestronConsole.ConsoleCommandResponse(response);
+                return;
+            }
 
+            response =
+                String.Format(
+                    "Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to create a new secret");
+            CrestronConsole.ConsoleCommandResponse(response);
         }
 
         private static void DeleteSecretProcess(string cmd)
@@ -318,14 +225,14 @@ namespace PepperDash.Essentials.Core
             if (args.Length == 0)
             {
                 //some Instructional Text
-                response = "Deletes secrets in secret provider. Format 'deletesecret <provider> <secretKey>'";
+                response = "Deletes secrets in secret provider. Format 'deletesecret <provider> <secretKey>";
                 CrestronConsole.ConsoleCommandResponse(response);
                 return;
 
             }
             if (args.Length == 1 && args[0] == "?")
             {
-                response = "Deletes secrets in secret provider. Format 'deletesecret <provider> <secretKey>'";
+                response = "Deletes secrets in secret provider. Format 'deletesecret <provider> <secretKey>";
                 CrestronConsole.ConsoleCommandResponse(response);
                 return;
             }

essentials-framework/Essentials Core/PepperDashEssentialsBase/SmartObjects/SubpageReferencList/SubpageReferenceList.cs

@@ -144,7 +144,7 @@ namespace PepperDash.Essentials.Core
 		public UShortOutputSig GetUShortOutputSig(uint index, uint sigNum)
 		{
 			if (sigNum > UShortIncrement) return null;
-            return SRL.UShortOutput.FirstOrDefault(s => s.Name.Equals(GetUShortOutputSigName(index, sigNum)));
+			return SRL.UShortOutput.FirstOrDefault(s => s.Name.Equals(GetBoolFeedbackSigName(index, sigNum)));
 		}
 
 		/// <summary>
@@ -159,7 +159,7 @@ namespace PepperDash.Essentials.Core
 		public StringOutputSig GetStringOutputSig(uint index, uint sigNum)
 		{
 			if (sigNum > StringIncrement) return null;
-            return SRL.StringOutput.FirstOrDefault(s => s.Name.Equals(GetStringOutputSigName(index, sigNum)));
+			return SRL.StringOutput.FirstOrDefault(s => s.Name.Equals(GetBoolFeedbackSigName(index, sigNum)));
 		}
 
 		/// <summary>

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

@@ -108,7 +108,6 @@
     <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\eMeetingPrivacy.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
-    <Compile Include="VideoCodec\IConvertiblePreset.cs" />
     <Compile Include="Codec\IHasCallHold.cs" />
     <Compile Include="Codec\IHasDoNotDisturb.cs" />
     <Compile Include="Codec\IHasExternalSourceSwitching.cs" />

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

@@ -1023,25 +1023,20 @@ ConnectorID: {2}"
                     if (tempPresets.Count > 0)
                     {
                         // Create temporary list to store the existing items from the CiscoCodecStatus.RoomPreset collection
-                        var existingRoomPresets = new List<IConvertiblePreset>();
+                        List<CiscoCodecStatus.RoomPreset> existingRoomPresets = new List<CiscoCodecStatus.RoomPreset>();
                         // Add the existing items to the temporary list
                         existingRoomPresets.AddRange(CodecStatus.Status.RoomPreset);
                         // Populate the CodecStatus object (this will append new values to the RoomPreset collection
                         JsonConvert.PopulateObject(response, CodecStatus);
 
-                        var jResponse = JObject.Parse(response);
-
-                        List<CiscoCodecStatus.RoomPreset> convertedRoomPresets =
-                            existingRoomPresets.Select(a => (CiscoCodecStatus.RoomPreset) a).ToList();
+                        JObject jResponse = JObject.Parse(response);
 
                         IList<JToken> roomPresets = jResponse["Status"]["RoomPreset"].Children().ToList();
                         // Iterate the new items in this response agains the temporary list.  Overwrite any existing items and add new ones.
-                        foreach (var camPreset in tempPresets)
+                        foreach (var preset in tempPresets)
                         {
-                            var preset = camPreset as CiscoCodecStatus.RoomPreset;
-                            if (preset == null) continue;
                             // First fine the existing preset that matches the id
-                            var existingPreset = convertedRoomPresets.FirstOrDefault(p => p.id.Equals(preset.id));
+                            var existingPreset = existingRoomPresets.FirstOrDefault(p => p.id.Equals(preset.id));
                             if (existingPreset != null)
                             {
                                 Debug.Console(1, this, "Existing Room Preset with ID: {0} found. Updating.", existingPreset.id);
@@ -1073,7 +1068,7 @@ ConnectorID: {2}"
                         CodecStatus.Status.RoomPreset = existingRoomPresets;
 
                         // Generecise the list
-                        NearEndPresets = existingRoomPresets.GetGenericPresets<CodecRoomPreset>();
+                        NearEndPresets = RoomPresets.GetGenericPresets(CodecStatus.Status.RoomPreset);
 
                         var handler = CodecRoomPresetsListHasChanged;
                         if (handler != null)
@@ -2470,6 +2465,20 @@ ConnectorID: {2}"
     }
 
 
+	/// <summary>
+    /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
+    /// </summary>
+    public class CodecCommandWithLabel
+    {
+        public string Command { get; set; }
+        public string Label { get; set; }
+
+        public CodecCommandWithLabel(string command, string label)
+        {
+            Command = command;
+            Label = label;
+        }
+    }
 
     /// <summary>
     /// Tracks the initial sycnronization state of the codec when making a connection

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

@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Presets;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
@@ -28,17 +33,39 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     public static class RoomPresets
     {
         /// <summary>
-        /// Converts non-generic RoomPresets to generic CameraPresets
+        /// Converts Cisco RoomPresets to generic CameraPresets
         /// </summary>
         /// <param name="presets"></param>
         /// <returns></returns>
-        public static List<T> GetGenericPresets<T>(this List<IConvertiblePreset> presets)
+        public static List<CodecRoomPreset> GetGenericPresets(List<CiscoCodecStatus.RoomPreset> presets)
         {
-            return
-                presets.Select(preset => preset.ConvertCodecPreset())
-                    .Where(newPreset => newPreset != null)
-                    .Cast<T>()
-                    .ToList();
+            var cameraPresets = new List<CodecRoomPreset>();
+
+            if (Debug.Level > 0)
+            {
+                Debug.Console(1, "Presets List:");
+            }
+
+            foreach (CiscoCodecStatus.RoomPreset preset in presets)
+            {
+                try
+                {
+                    var cameraPreset = new CodecRoomPreset(UInt16.Parse(preset.id), preset.Description.Value, preset.Defined.BoolValue, true);
+
+                    cameraPresets.Add(cameraPreset);
+
+                    if (Debug.Level > 0)
+                    {
+                        Debug.Console(1, "Added Preset ID: {0}, Description: {1}, IsDefined: {2}, isDefinable: {3}", cameraPreset.ID, cameraPreset.Description, cameraPreset.Defined, cameraPreset.IsDefinable);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.Console(2, "Unable to convert preset: {0}. Error: {1}", preset.id, e);
+                }  
+            }
+
+            return cameraPresets;
         }
     }
 

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

@@ -9,7 +9,6 @@ using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec;
-using PepperDash.Essentials.Core.Presets;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
@@ -2186,7 +2185,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
         }
 
-        public class RoomPreset : IConvertiblePreset
+        public class RoomPreset
         {
             public string id { get; set; }
             public Defined Defined { get; set; }
@@ -2199,24 +2198,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 Description = new Description2();
                 Type = new Type5();
             }
-
-            public PresetBase ConvertCodecPreset()
-            {
-                    try
-                    {
-                        var preset =  new CodecRoomPreset(UInt16.Parse(id), Description.Value, Defined.BoolValue, true);
-
-                        Debug.Console(2, "Preset ID {0} Converted from Cisco Codec Preset to Essentials Preset");
-
-                        return preset;
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(2, "Unable to convert preset: {0}. Error: {1}", id, e);
-                        return null;
-                    }            
-            }
-}
+        }
 
 
 
@@ -2240,7 +2222,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Proximity Proximity { get; set; }
             public RoomAnalytics RoomAnalytics { get; set; }
 
-            public List<IConvertiblePreset> RoomPreset { get; set; }
+            public List<RoomPreset> RoomPreset { get; set; }
 
             public SIP SIP { get; set; }
             public Security Security { get; set; }
@@ -2257,7 +2239,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 Standby = new Standby();
                 Cameras = new Cameras();
                 RoomAnalytics = new RoomAnalytics();
-                RoomPreset = new List<IConvertiblePreset>();
+                RoomPreset = new List<RoomPreset>();
                 Conference = new Conference2();
                 SystemUnit = new SystemUnit();
                 Video = new Video();

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

@@ -1,9 +0,0 @@
-using PepperDash.Essentials.Core.Presets;
-
-namespace PepperDash.Essentials.Devices.Common.VideoCodec
-{
-    public interface IConvertiblePreset
-    {
-        PresetBase ConvertCodecPreset();
-    }
-}

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

@@ -22,26 +22,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		void MinMaxLayoutToggle();
     }
 
-    /// <summary>
-    /// Defines the required elements for layout control with direct layout selection
-    /// </summary>
-    public interface IHasCodecLayoutsAvailable : IHasCodecLayouts
-    {
-
-        event EventHandler<AvailableLayoutChangedEventArgs> AvailableLayoutsChanged;
-
-        StringFeedback AvailableLocalLayoutsFeedback { get; }
-        List<CodecCommandWithLabel> AvailableLocalLayouts { get; }
-        void LocalLayoutSet(string layout);
-        void LocalLayoutSet(CodecCommandWithLabel layout);
-
-    }
-
-    public class AvailableLayoutChangedEventArgs : EventArgs
-    {
-        public List<CodecCommandWithLabel>  AvailableLayouts { get; set; }
-    }
-
     /// <summary>
     /// Defines the requirements for Zoom Room layout control
     /// </summary>

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

@@ -1,5 +1,5 @@
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

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

@@ -1,4 +1,4 @@
-using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {

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

@@ -370,11 +370,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
 			}
 
-		    if (codec is IHasCodecLayoutsAvailable)
-		    {
-		        LinkVideoCodecAvailableLayoutsToApi(codec as IHasCodecLayoutsAvailable, trilist, joinMap);
-		    }
-
 			if (codec is IHasSelfviewPosition)
 			{
 				LinkVideoCodecSelfviewPositionToApi(codec as IHasSelfviewPosition, trilist, joinMap);
@@ -792,7 +787,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			trilist.SetSigFalseAction(joinMap.SourceShareStart.JoinNumber, StartSharing);
 			trilist.SetSigFalseAction(joinMap.SourceShareEnd.JoinNumber, StopSharing);
 
-			trilist.SetBoolSigAction(joinMap.SourceShareAutoStart.JoinNumber, b => AutoShareContentWhileInCall = b);
+			trilist.SetBoolSigAction(joinMap.SourceShareAutoStart.JoinNumber, (b) => AutoShareContentWhileInCall = b);
 		}
 
 		private List<Meeting> _currentMeetings = new List<Meeting>();
@@ -803,7 +798,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			trilist.SetUShortSigAction(joinMap.MinutesBeforeMeetingStart.JoinNumber, (i) =>
 			{
-			    codec.CodecSchedule.MeetingWarningMinutes = i;
+				codec.CodecSchedule.MeetingWarningMinutes = i;
 			});
 
 			trilist.SetSigFalseAction(joinMap.DialMeeting1.JoinNumber, () =>
@@ -1001,9 +996,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			trilist.SetUShortSigAction(joinMap.DirectorySelectRow.JoinNumber, (i) => SelectDirectoryEntry(codec, i, trilist, joinMap));
 
-		    trilist.SetBoolSigAction(joinMap.DirectoryClearSelection.JoinNumber,
-		        delegate { SelectDirectoryEntry(codec, 0, trilist, joinMap); });
-
             // Report feedback for number of contact methods for selected contact
 
 			trilist.SetSigFalseAction(joinMap.DirectoryRoot.JoinNumber, codec.SetCurrentDirectoryToRoot);
@@ -1052,12 +1044,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		}
 
 
+
 		private void SelectDirectoryEntry(IHasDirectory codec, ushort i, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
-            if (i > codec.CurrentDirectoryResult.CurrentDirectoryResults.Count) return;
-		    _selectedDirectoryItem = i == 0 ? null : codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
+            if (i < 1 || i > codec.CurrentDirectoryResult.CurrentDirectoryResults.Count) return;
+
+			_selectedDirectoryItem = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
 
-            trilist.SetUshort(joinMap.DirectorySelectRow.JoinNumber, i);
 
 			if (_selectedDirectoryItem is DirectoryFolder)
 			{
@@ -1075,11 +1068,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             trilist.SetString(joinMap.DirectorySelectedFolderName.JoinNumber, string.Empty);
 
             var selectedContact = _selectedDirectoryItem as DirectoryContact;
+            if (selectedContact != null)
+            {
+                trilist.SetString(joinMap.DirectoryEntrySelectedName.JoinNumber, selectedContact.Name);
+            
+            }
 
-		    trilist.SetString(joinMap.DirectoryEntrySelectedName.JoinNumber,
-		        selectedContact != null ? selectedContact.Name : string.Empty);
-
-		    // Allow auto dial of selected line.  Always dials first contact method
+            // Allow auto dial of selected line.  Always dials first contact method
             if (!trilist.GetBool(joinMap.DirectoryDisableAutoDialSelectedLine.JoinNumber))
             {
                 var invitableEntry = _selectedDirectoryItem as IInvitableContact;
@@ -1092,12 +1087,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
                 var entryToDial = _selectedDirectoryItem as DirectoryContact;
 
-                trilist.SetString(joinMap.DirectoryEntrySelectedNumber.JoinNumber, 
-                    selectedContact != null ? selectedContact.ContactMethods[0].Number : string.Empty);
+                trilist.SetString(joinMap.DirectoryEntrySelectedNumber.JoinNumber, selectedContact.ContactMethods[0].Number);
 
                 if (entryToDial == null) return;
 
                 Dial(entryToDial.ContactMethods[0].Number);
+                return;
             }
             else
             {
@@ -1476,14 +1471,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			codec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentLayoutStringFb.JoinNumber]);
 		}
 
-	    private void LinkVideoCodecAvailableLayoutsToApi(IHasCodecLayoutsAvailable codec, BasicTriList trilist,
-	        VideoCodecControllerJoinMap joinMap)
-	    {
-	        codec.AvailableLocalLayoutsFeedback.LinkInputSig(trilist.StringInput[joinMap.AvailableLayoutsFb.JoinNumber]);
-
-	        trilist.SetStringSigAction(joinMap.SelectLayout.JoinNumber, codec.LocalLayoutSet);
-	    }
-
 		private void LinkVideoCodecCameraModeToApi(IHasCameraAutoMode codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
 		{
 			trilist.SetSigFalseAction(joinMap.CameraModeAuto.JoinNumber, codec.CameraAutoModeOn);
@@ -1995,19 +1982,4 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			}
 		}
 	}
-    /// <summary>
-    /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
-    /// </summary>
-    public class CodecCommandWithLabel
-    {
-        public string Command { get; private set; }
-        public string Label { get; private set; }
-
-        public CodecCommandWithLabel(string command, string label)
-        {
-            Command = command;
-            Label = label;
-        }
-    }
-
 }