Merge branch 'development' into feature/cws

.github/workflows/add-issues-to-project.yml

@@ -0,0 +1,37 @@
+name: Add bugs to bugs project
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+      
+jobs:
+  check-secret:
+    runs-on: ubuntu-latest
+    outputs:
+      my-key: ${{ steps.my-key.outputs.defined }}
+    steps:
+        - id: my-key
+          if: "${{ env.MY_KEY != '' }}"
+          run: echo "::set-output name=defined::true"
+          env:
+              MY_KEY: ${{ secrets.PROJECT_URL }}
+  throw-error: 
+    name: Check
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key != 'true'
+    steps:
+      - run: echo "The Project URL Repo Secret is empty"
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    needs: [check-secret]
+    if: needs.check-secret.outputs.my-key == 'true'
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: ${{ secrets.PROJECT_URL }}
+          github-token: ${{ secrets.GH_PROJECTS_PASSWORD }}
+

PepperDashEssentials/ControlSystem.cs

@@ -80,7 +80,7 @@ namespace PepperDash.Essentials
 
             CrestronConsole.AddNewConsoleCommand(PluginLoader.ReportAssemblyVersions, "reportversions", "Reports the versions of the loaded assemblies", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
 

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

@@ -0,0 +1,34 @@
+using System;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    public class IAnalogInputJoinMap : JoinMapBaseAdvanced
+    {
+
+        [JoinName("InputValue")]
+        public JoinDataComplete InputValue = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+            new JoinMetadata { Description = "Input Value", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+        [JoinName("MinimumChange")]
+        public JoinDataComplete MinimumChange = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+            new JoinMetadata { Description = "Minimum voltage change required to reflect a change", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+        /// <summary>
+        /// Constructor to use when instantiating this Join Map without inheriting from it
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        public IAnalogInputJoinMap(uint joinStart)
+            : this(joinStart, typeof(IAnalogInputJoinMap))
+        {
+        }
+
+        /// <summary>
+        /// Constructor to use when extending this Join map
+        /// </summary>
+        /// <param name="joinStart">Join this join map will start at</param>
+        /// <param name="type">Type of the child join map</param>
+        protected IAnalogInputJoinMap(uint joinStart, Type type)
+            : base(joinStart, type)
+        {
+        }
+    }
+}

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

@@ -7,7 +7,7 @@ namespace PepperDash.Essentials.Core.Bridges
 
         [JoinName("InputState")]
         public JoinDataComplete InputState = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Room Email Url", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Input State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
         /// <summary>
         /// Constructor to use when instantiating this Join Map without inheriting from it

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/IOPortConfig.cs

@@ -15,5 +15,7 @@ namespace PepperDash.Essentials.Core.CrestronIO
         public uint PortNumber { get; set; }
         [JsonProperty("disablePullUpResistor")]
         public bool DisablePullUpResistor { get; set; }
+        [JsonProperty("minimumChange")]
+        public int MinimumChange { get; set; }
     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportAnalogInputDevice.cs

@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
+
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    /// <summary>
+    /// Represents a generic digital input deviced tied to a versiport
+    /// </summary>
+    public class GenericVersiportAnalogInputDevice : EssentialsBridgeableDevice, IAnalogInput
+    {
+        public Versiport InputPort { get; private set; }
+
+        public IntFeedback InputValueFeedback { get; private set; }
+        public IntFeedback InputMinimumChangeFeedback { get; private set; }
+
+        Func<int> InputValueFeedbackFunc
+        {
+            get
+            {
+                return () => InputPort.AnalogIn;
+            }
+        }
+
+        Func<int> InputMinimumChangeFeedbackFunc
+        {
+            get { return () => InputPort.AnalogMinChange; }
+        } 
+
+        public GenericVersiportAnalogInputDevice(string key, string name, Func<IOPortConfig, Versiport> postActivationFunc, IOPortConfig config) :
+            base(key, name)
+        {
+            InputValueFeedback = new IntFeedback(InputValueFeedbackFunc);
+            InputMinimumChangeFeedback = new IntFeedback(InputMinimumChangeFeedbackFunc);
+
+            AddPostActivationAction(() =>
+            {
+                InputPort = postActivationFunc(config);
+
+                InputPort.Register();
+
+                InputPort.SetVersiportConfiguration(eVersiportConfiguration.AnalogInput);
+                InputPort.AnalogMinChange = (ushort)(config.MinimumChange > 0 ? config.MinimumChange : 655);
+                if (config.DisablePullUpResistor)
+                    InputPort.DisablePullUpResistor = true;
+
+                InputPort.VersiportChange += InputPort_VersiportChange;
+
+                Debug.Console(1, this, "Created GenericVersiportAnalogInputDevice on port '{0}'.  DisablePullUpResistor: '{1}'", config.PortNumber, InputPort.DisablePullUpResistor);
+
+            });
+
+        }
+
+        /// <summary>
+        /// Set minimum voltage change for device to update voltage changed method
+        /// </summary>
+        /// <param name="value">valid values range from 0 - 65535, representing the full 100% range of the processor voltage source.  Check processor documentation for details</param>
+        public void SetMinimumChange(ushort value)
+        {
+            InputPort.AnalogMinChange = value;
+        }
+
+        void InputPort_VersiportChange(Versiport port, VersiportEventArgs args)
+        {
+			Debug.Console(1, this, "Versiport change: {0}", args.Event);
+
+            if(args.Event == eVersiportEvent.AnalogInChange)
+                InputValueFeedback.FireUpdate();
+            if (args.Event == eVersiportEvent.AnalogMinChangeChange)
+                InputMinimumChangeFeedback.FireUpdate();
+        }
+
+
+        #region Bridge Linking
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new IAnalogInputJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<IAnalogInputJoinMap>(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.");
+            }
+
+            try
+            {
+                Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+                // Link feedback for input state
+                InputValueFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputValue.JoinNumber]);
+                InputMinimumChangeFeedback.LinkInputSig(trilist.UShortInput[joinMap.MinimumChange.JoinNumber]);
+                trilist.SetUShortSigAction(joinMap.MinimumChange.JoinNumber, SetMinimumChange);
+
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, this, "Unable to link device '{0}'.  Input is null", Key);
+                Debug.Console(1, this, "Error: {0}", e);
+            }
+
+            trilist.OnlineStatusChange += (d, args) =>
+            {
+                if (!args.DeviceOnLine) return;
+                InputValueFeedback.FireUpdate();
+                InputMinimumChangeFeedback.FireUpdate();
+            };
+
+        }
+
+        void trilist_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+
+        public static Versiport GetVersiportDigitalInput(IOPortConfig dc)
+        {
+         
+            IIOPorts ioPortDevice;
+
+            if (dc.PortDeviceKey.Equals("processor"))
+            {
+                if (!Global.ControlSystem.SupportsVersiport)
+                {
+                    Debug.Console(0, "GetVersiportAnalogInput: Processor does not support Versiports");
+                    return null;
+                }
+                ioPortDevice = Global.ControlSystem;
+            }
+            else
+            {
+                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                if (ioPortDev == null)
+                {
+                    Debug.Console(0, "GetVersiportAnalogInput: Device {0} is not a valid device", dc.PortDeviceKey);
+                    return null;
+                }
+                ioPortDevice = ioPortDev;
+            }
+            if (ioPortDevice == null)
+            {
+                Debug.Console(0, "GetVersiportAnalogInput: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
+                return null;
+            }
+
+            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
+            {
+                Debug.Console(0, "GetVersiportAnalogInput: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
+            }
+            if(!ioPortDevice.VersiPorts[dc.PortNumber].SupportsAnalogInput)
+            {
+                Debug.Console(0, "GetVersiportAnalogInput: Device {0} does not support AnalogInput on port {1}", dc.PortDeviceKey, dc.PortNumber);
+                return null;
+            }
+
+
+            return ioPortDevice.VersiPorts[dc.PortNumber];
+
+
+        }
+    }
+
+
+    public class GenericVersiportAbalogInputDeviceFactory : EssentialsDeviceFactory<GenericVersiportAnalogInputDevice>
+    {
+        public GenericVersiportAbalogInputDeviceFactory()
+        {
+            TypeNames = new List<string>() { "versiportanaloginput" };
+        }
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            Debug.Console(1, "Factory Attempting to create new Generic Versiport Device");
+
+            var props = JsonConvert.DeserializeObject<IOPortConfig>(dc.Properties.ToString());
+
+            if (props == null) return null;
+
+            var portDevice = new GenericVersiportAnalogInputDevice(dc.Key, dc.Name, GenericVersiportAnalogInputDevice.GetVersiportDigitalInput, props);
+
+            return portDevice;
+        }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/IAnalogInput.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core.CrestronIO
+{
+    public interface IAnalogInput
+    {
+        IntFeedback InputValueFeedback { get; }
+    }
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Crestron IO/Outputs/GenericVersiportOutputDevice.cs

@@ -42,18 +42,19 @@ namespace PepperDash.Essentials.Core.CrestronIO
                 OutputPort = postActivationFunc(config);
 
                 OutputPort.Register();
+
+
                 if (!OutputPort.SupportsDigitalOutput)
                 {
                     Debug.Console(0, this, "Device does not support configuration as a Digital Output");
                     return;
                 }
 
+                OutputPort.SetVersiportConfiguration(eVersiportConfiguration.DigitalOutput);
+
+
                 OutputPort.VersiportChange += OutputPort_VersiportChange;
 
-
-
-                Debug.Console(1, this, "Created GenericVersiportDigitalOutputDevice on port '{0}'.", config.PortNumber);
-
             });
 
         }
@@ -72,7 +73,18 @@ namespace PepperDash.Essentials.Core.CrestronIO
         /// <param name="state">value to set the output to</param>
         public void SetOutput(bool state)
         {
-            OutputPort.DigitalOut = state;
+                if (OutputPort.SupportsDigitalOutput)
+                {
+                    Debug.Console(0, this, "Passed the Check");
+
+                    OutputPort.DigitalOut = state;
+
+                }
+                else
+                {
+                    Debug.Console(0, this, "Versiport does not support Digital Output Mode");
+                }
+
         }
 
         #region Bridge Linking
@@ -116,39 +128,39 @@ namespace PepperDash.Essentials.Core.CrestronIO
         public static Versiport GetVersiportDigitalOutput(IOPortConfig dc)
         {
 
-            IIOPorts ioPortDevice;
+                IIOPorts ioPortDevice;
 
-            if (dc.PortDeviceKey.Equals("processor"))
+                if (dc.PortDeviceKey.Equals("processor"))
-            {
-                if (!Global.ControlSystem.SupportsVersiport)
                 {
-                    Debug.Console(0, "GetVersiportDigitalOuptut: Processor does not support Versiports");
+                    if (!Global.ControlSystem.SupportsVersiport)
+                    {
+                        Debug.Console(0, "GetVersiportDigitalOuptut: Processor does not support Versiports");
+                        return null;
+                    }
+                    ioPortDevice = Global.ControlSystem;
+                }
+                else
+                {
+                    var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
+                    if (ioPortDev == null)
+                    {
+                        Debug.Console(0, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
+                        return null;
+                    }
+                    ioPortDevice = ioPortDev;
+                }
+                if (ioPortDevice == null)
+                {
+                    Debug.Console(0, "GetVersiportDigitalOuptut: Device '0' is not a valid IOPorts Device", dc.PortDeviceKey);
                     return null;
                 }
-                ioPortDevice = Global.ControlSystem;
+
-            }
+                if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
-            else
-            {
-                var ioPortDev = DeviceManager.GetDeviceForKey(dc.PortDeviceKey) as IIOPorts;
-                if (ioPortDev == null)
                 {
-                    Debug.Console(0, "GetVersiportDigitalOuptut: Device {0} is not a valid device", dc.PortDeviceKey);
+                    Debug.Console(0, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-                    return null;
                 }
-                ioPortDevice = ioPortDev;
+                var port = ioPortDevice.VersiPorts[dc.PortNumber];
-            }
+                return port;
-            if (ioPortDevice == null)
-            {
-                Debug.Console(0, "GetVersiportDigitalOuptut: Device '0' is not a valid IIOPorts Device", dc.PortDeviceKey);
-                return null;
-            }
-
-            if (dc.PortNumber > ioPortDevice.NumberOfVersiPorts)
-            {
-                Debug.Console(0, "GetVersiportDigitalOuptut: Device {0} does not contain a port {1}", dc.PortDeviceKey, dc.PortNumber);
-            }
-
-            return ioPortDevice.VersiPorts[dc.PortNumber];
 
         }
     }

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

@@ -388,20 +388,18 @@ namespace PepperDash.Essentials.Core
             var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
 	        if (inputPorts != null)
 	        {
-	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
+                CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Input Ports:", s, inputPorts.Count);
 	            foreach (var routingInputPort in inputPorts)
 	            {
-	                Debug.Console(0, "{0}", routingInputPort.Key);
+                    CrestronConsole.ConsoleCommandResponse("{0}", routingInputPort.Key);
-	            }
-	        }
-	        if (outputPorts != null)
-	        {
-	            Debug.Console(0, "Device {0} has {1} Output Ports:", s, outputPorts.Count);
-	            foreach (var routingOutputPort in outputPorts)
-	            {
-	                Debug.Console(0, "{0}", routingOutputPort.Key);
 	            }
 	        }
+            if (outputPorts == null) return;
+            CrestronConsole.ConsoleCommandResponse("Device {0} has {1} Output Ports:", s, outputPorts.Count);
+            foreach (var routingOutputPort in outputPorts)
+            {
+                CrestronConsole.ConsoleCommandResponse("{0}", routingOutputPort.Key);
+            }
 	    }
 
         /// <summary>
@@ -435,7 +433,7 @@ namespace PepperDash.Essentials.Core
 
             if (device == null)
             {
-                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
+                CrestronConsole.ConsoleCommandResponse("Unable to get device with key: {0}", deviceKey);
                 return;
             }
 
@@ -447,7 +445,7 @@ namespace PepperDash.Essentials.Core
             }
             catch
             {
-                Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
+                CrestronConsole.ConsoleCommandResponse("Unable to convert setting value.  Please use off/rx/tx/both");
                 return;
             }
 
@@ -458,18 +456,18 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
+                    CrestronConsole.ConsoleCommandResponse("Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)
                 {
-                    Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
+                    CrestronConsole.ConsoleCommandResponse("Unable to convert minutes or settings value.  Please use an integer value for minutes. Error: {0}", e);
                 }
             }
             else
             {
                 device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                Debug.Console(0, "Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
+                CrestronConsole.ConsoleCommandResponse("Device: '{0}' debug level set to {1} for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

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

@@ -172,21 +172,14 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// Prints the type names and associated metadata from the FactoryMethods collection.
         /// </summary>
-        /// <param name="command"></param>
+        /// <param name="filter"></param>
         public static void GetDeviceFactoryTypes(string filter)
         {
-            Dictionary<string, DeviceFactoryWrapper> types = new Dictionary<string, DeviceFactoryWrapper>();
+            var types = !string.IsNullOrEmpty(filter) 
+                ? FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value) 
+                : FactoryMethods;
 
-            if (!string.IsNullOrEmpty(filter))
+            CrestronConsole.ConsoleCommandResponse("Device Types:");
-            {
-                types = FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value);
-            }
-            else
-            {
-                types = FactoryMethods;
-            }
-
-            Debug.Console(0, "Device Types:");
 
             foreach (var type in types.OrderBy(t => t.Key))
             {
@@ -198,7 +191,7 @@ namespace PepperDash.Essentials.Core
                     cType = type.Value.CType.FullName;
                 }
 
-                Debug.Console(0, 
+                CrestronConsole.ConsoleCommandResponse( 
                     @"Type: '{0}' 
                     CType: '{1}' 
                     Description: {2}", type.Key, cType, description);

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

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Globalization;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using Crestron.SimplSharp.Reflection;
 using Crestron.SimplSharp.CrestronIO;
@@ -103,22 +101,22 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public void PrintJoinMapInfo()
         {
-            Debug.Console(0, "{0}:\n", GetType().Name);
+            CrestronConsole.ConsoleCommandResponse("{0}:\n", GetType().Name);
 
             // Get the joins of each type and print them
-            Debug.Console(0, "Digitals:");
+            CrestronConsole.ConsoleCommandResponse("Digitals:");
             var digitals = Joins.Where(j => (j.Value.JoinType & eJoinType.Digital) == eJoinType.Digital).ToDictionary(j => j.Key, j => j.Value);
-            Debug.Console(2, "Found {0} Digital Joins", digitals.Count); 
+            CrestronConsole.ConsoleCommandResponse("Found {0} Digital Joins", digitals.Count); 
             PrintJoinList(GetSortedJoins(digitals));
 
-            Debug.Console(0, "Analogs:");
+            CrestronConsole.ConsoleCommandResponse("Analogs:");
             var analogs = Joins.Where(j => (j.Value.JoinType & eJoinType.Analog) == eJoinType.Analog).ToDictionary(j => j.Key, j => j.Value);
-            Debug.Console(2, "Found {0} Analog Joins", analogs.Count); 
+            CrestronConsole.ConsoleCommandResponse("Found {0} Analog Joins", analogs.Count); 
             PrintJoinList(GetSortedJoins(analogs));
 
-            Debug.Console(0, "Serials:");
+            CrestronConsole.ConsoleCommandResponse("Serials:");
             var serials = Joins.Where(j => (j.Value.JoinType & eJoinType.Serial) == eJoinType.Serial).ToDictionary(j => j.Key, j => j.Value);
-            Debug.Console(2, "Found {0} Serial Joins", serials.Count);
+            CrestronConsole.ConsoleCommandResponse("Found {0} Serial Joins", serials.Count);
             PrintJoinList(GetSortedJoins(serials));
 
         }
@@ -141,7 +139,7 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var join in joins)
             {
-                Debug.Console(0,
+                CrestronConsole.ConsoleCommandResponse(
                     @"Join Number: {0} | Label: '{1}' | JoinSpan: '{2}' | Type: '{3}' | Capabilities: '{4}'",
                         join.Value.JoinNumber,
                         join.Value.Label,
@@ -236,25 +234,45 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public void PrintJoinMapInfo()
         {
-            Debug.Console(0, "{0}:\n", GetType().Name);
+            var sb = JoinmapStringBuilder();
+
+            CrestronConsole.ConsoleCommandResponse(sb.ToString());
+        }
+
+        private StringBuilder JoinmapStringBuilder()
+        {
+            var sb = new StringBuilder();
 
             // Get the joins of each type and print them
-            Debug.Console(0, "Digitals:");
+            sb.AppendLine(String.Format("# {0}", GetType().Name));
-            var digitals = Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Digital) == eJoinType.Digital).ToDictionary(j => j.Key, j => j.Value);
+            sb.AppendLine();
-            Debug.Console(2, "Found {0} Digital Joins", digitals.Count);
+            sb.AppendLine("## Digitals");
-            PrintJoinList(GetSortedJoins(digitals));
+            sb.AppendLine();
+            // Get the joins of each type and print them
+            var digitals =
+                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Digital) == eJoinType.Digital)
+                    .ToDictionary(j => j.Key, j => j.Value);
+            var digitalSb = AppendJoinList(GetSortedJoins(digitals));
+            digitalSb.AppendLine("## Analogs");
+            digitalSb.AppendLine();
 
-            Debug.Console(0, "Analogs:");
+            var analogs =
-            var analogs = Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Analog) == eJoinType.Analog).ToDictionary(j => j.Key, j => j.Value);
+                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Analog) == eJoinType.Analog)
-            Debug.Console(2, "Found {0} Analog Joins", analogs.Count);
+                    .ToDictionary(j => j.Key, j => j.Value);
-            PrintJoinList(GetSortedJoins(analogs));
+            var analogSb = AppendJoinList(GetSortedJoins(analogs));
+            analogSb.AppendLine("## Serials");
+            analogSb.AppendLine();
 
-            Debug.Console(0, "Serials:");
+            var serials =
-            var serials = Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Serial) == eJoinType.Serial).ToDictionary(j => j.Key, j => j.Value);
+                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Serial) == eJoinType.Serial)
-            Debug.Console(2, "Found {0} Serial Joins", serials.Count);
+                    .ToDictionary(j => j.Key, j => j.Value);
-            PrintJoinList(GetSortedJoins(serials));
+            var serialSb = AppendJoinList(GetSortedJoins(serials));
 
+            sb.EnsureCapacity(sb.Length + digitalSb.Length + analogSb.Length + serialSb.Length);
+            sb.Append(digitalSb).Append(analogSb).Append(serialSb);
+            return sb;
         }
+
         /// <summary>
         /// Prints the join information to console
         /// </summary>
@@ -262,37 +280,11 @@ namespace PepperDash.Essentials.Core
         {
             var pluginType = GetType().Name;
 
-            Debug.Console(0, "{0}:\n", pluginType);
+            CrestronConsole.ConsoleCommandResponse("{0}:\n", pluginType);
 
-            var sb = new StringBuilder();
 
-            sb.AppendLine(String.Format("# {0}", GetType().Name));
-            sb.AppendLine(String.Format("Generated from '{0}' on bridge '{1}'", deviceKey, bridgeKey));
-            sb.AppendLine();
-            sb.AppendLine("## Digitals");
-            // Get the joins of each type and print them
-            var digitals = Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Digital) == eJoinType.Digital).ToDictionary(j => j.Key, j => j.Value);
-            Debug.Console(2, "Found {0} Digital Joins", digitals.Count);
-            var digitalSb = AppendJoinList(GetSortedJoins(digitals));
-            digitalSb.AppendLine("## Analogs");
-            digitalSb.AppendLine();
 
-            Debug.Console(0, "Analogs:");
+            WriteJoinmapMarkdown(JoinmapStringBuilder(), pluginType, bridgeKey, deviceKey);
-            var analogs = Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Analog) == eJoinType.Analog).ToDictionary(j => j.Key, j => j.Value);
-            Debug.Console(2, "Found {0} Analog Joins", analogs.Count);
-            var analogSb = AppendJoinList(GetSortedJoins(analogs));
-            analogSb.AppendLine("## Serials");
-            analogSb.AppendLine();
-
-            Debug.Console(0, "Serials:");
-            var serials = Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Serial) == eJoinType.Serial).ToDictionary(j => j.Key, j => j.Value);
-            Debug.Console(2, "Found {0} Serial Joins", serials.Count);
-            var serialSb = AppendJoinList(GetSortedJoins(serials));
-
-            sb.EnsureCapacity(sb.Length + digitalSb.Length + analogSb.Length + serialSb.Length);
-            sb.Append(digitalSb).Append(analogSb).Append(serialSb);
-
-            WriteJoinmapMarkdown(sb, pluginType, bridgeKey, deviceKey);
 
         }
 
@@ -303,7 +295,7 @@ namespace PepperDash.Essentials.Core
             using (var sw = new StreamWriter(fileName))
             {
                 sw.WriteLine(stringBuilder.ToString());
-                Debug.Console(0, "Joinmap Readme generated and written to {0}", fileName);
+                CrestronConsole.ConsoleCommandResponse("Joinmap Readme generated and written to {0}", fileName);
             }
 
         }
@@ -313,7 +305,7 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         /// <param name="joins"></param>
         /// <returns></returns>
-        List<KeyValuePair<string, JoinDataComplete>> GetSortedJoins(Dictionary<string, JoinDataComplete> joins)
+        static List<KeyValuePair<string, JoinDataComplete>> GetSortedJoins(Dictionary<string, JoinDataComplete> joins)
         {
             var sortedJoins = joins.ToList();
 
@@ -322,20 +314,6 @@ namespace PepperDash.Essentials.Core
             return sortedJoins;
         }
 
-        void PrintJoinList(List<KeyValuePair<string, JoinDataComplete>> joins)
-        {
-            foreach (var join in joins)
-            {
-                Debug.Console(0,
-                    @"Join Number: {0} | JoinSpan: '{1}' | JoinName: {2} | Description: '{3}' | Type: '{4}' | Capabilities: '{5}'",
-                        join.Value.JoinNumber,
-                        join.Value.JoinSpan,
-                        join.Key,
-                        String.IsNullOrEmpty(join.Value.AttributeName) ? join.Value.Metadata.Label : join.Value.AttributeName,
-                        join.Value.Metadata.JoinType.ToString(),
-                        join.Value.Metadata.JoinCapabilities.ToString());
-            }
-        }
 
         static StringBuilder AppendJoinList(List<KeyValuePair<string, JoinDataComplete>> joins)
         {

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

@@ -127,6 +127,7 @@
     <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Bridges\JoinMaps\AirMediaControllerJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\AppleTvJoinMap.cs" />
+    <Compile Include="Bridges\JoinMaps\IAnalogInputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\IDigitalOutputJoinMap.cs" />
     <Compile Include="Bridges\JoinMaps\PduJoinMapBase.cs" />
     <Compile Include="Bridges\JoinMaps\C2nRthsControllerJoinMap.cs" />
@@ -186,8 +187,10 @@
     <Compile Include="Crestron IO\DinCenCn\IHasCresnetBranches.cs" />
     <Compile Include="Crestron IO\DinIo8\DinIo8Controller.cs" />
     <Compile Include="Crestron IO\Inputs\CenIoDigIn104Controller.cs" />
+    <Compile Include="Crestron IO\Inputs\GenericVersiportAnalogInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
     <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
+    <Compile Include="Crestron IO\Inputs\IAnalogInput.cs" />
     <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
     <Compile Include="Crestron IO\IOPortConfig.cs" />
     <Compile Include="Crestron IO\Ir\CenIoIr104Controller.cs" />

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

@@ -194,10 +194,11 @@ namespace PepperDash.Essentials
         /// <param name="command"></param>
         public static void ReportAssemblyVersions(string command)
         {
-            Debug.Console(0, "Loaded Assemblies:");
+
+            CrestronConsole.ConsoleCommandResponse("Loaded Assemblies:");
             foreach (var assembly in LoadedAssemblies)
             {
-                Debug.Console(0, "{0} Version: {1}", assembly.Name, assembly.Version);
+                CrestronConsole.ConsoleCommandResponse("{0} Version: {1}", assembly.Name, assembly.Version);
             }
         }
 

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

@@ -1004,7 +1004,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 		    if (codec.DirectoryRoot != null)
 		    {
-                trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)codec.DirectoryRoot.CurrentDirectoryResults.Count);
+				var contactsCount = codec.DirectoryRoot.CurrentDirectoryResults.Where(c => c.ParentFolderId.Equals("root")).ToList().Count;				
+                trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)contactsCount);
+				Debug.Console(2, this, ">>> contactsCount: {0}", contactsCount);
 
                 var clearBytes = XSigHelpers.ClearOutputs();
 
@@ -1020,7 +1022,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
 			codec.DirectoryResultReturned += (sender, args) =>
 			{
-				trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)args.Directory.CurrentDirectoryResults.Count);
+				var isRoot = codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false;
+				var argsCount = isRoot 
+					? args.Directory.CurrentDirectoryResults.Where(a => a.ParentFolderId.Equals("root")).ToList().Count
+					: args.Directory.CurrentDirectoryResults.Count;
+
+				trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)argsCount);
+				Debug.Console(2, this, ">>> argsCount: {0}", argsCount);
 
 				var clearBytes = XSigHelpers.ClearOutputs();
 
@@ -1184,46 +1192,47 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
             return GetXSigString(tokenArray);
         }
 
-	    private string UpdateDirectoryXSig(CodecDirectory directory, bool isRoot)
+		private string UpdateDirectoryXSig(CodecDirectory directory, bool isRoot)
-	    {
+		{
-	        var xSigMaxIndex = 1023;
+			var xSigMaxIndex = 1023;
-	        var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count > xSigMaxIndex
+			var tokenArray = new XSigToken[directory.CurrentDirectoryResults.Count > xSigMaxIndex
-	            ? xSigMaxIndex
+				? xSigMaxIndex
-	            : directory.CurrentDirectoryResults.Count];
+				: directory.CurrentDirectoryResults.Count];
 
-	        Debug.Console(2, this, "IsRoot: {0}, Directory Count: {1}, TokenArray.Length: {2}", isRoot,
+			Debug.Console(2, this, "IsRoot: {0}, Directory Count: {1}, TokenArray.Length: {2}", isRoot, directory.CurrentDirectoryResults.Count, tokenArray.Length);
-	            directory.CurrentDirectoryResults.Count, tokenArray.Length);
 
-	        var contacts = directory.CurrentDirectoryResults.Count > xSigMaxIndex
+			var contacts = directory.CurrentDirectoryResults.Count > xSigMaxIndex
-	            ? directory.CurrentDirectoryResults.Take(xSigMaxIndex)
+				? directory.CurrentDirectoryResults.Take(xSigMaxIndex)
-	            : directory.CurrentDirectoryResults;
+				: directory.CurrentDirectoryResults;
 
-	        var counterIndex = 1;
+			var contactsToDisplay = isRoot
-	        foreach (var entry in contacts)
+				? contacts.Where(c => c.ParentFolderId == "root")
-	        {
+				: contacts.Where(c => c.ParentFolderId != "root");
-	            var arrayIndex = counterIndex - 1;
-	            var entryIndex = counterIndex;
 
-	            Debug.Console(2, this, "Entry{2:0000} Name: {0}, Folder ID: {1}", entry.Name, entry.FolderId, entryIndex);
+			var counterIndex = 1;
+			foreach (var entry in contactsToDisplay)
+			{
+				var arrayIndex = counterIndex - 1;
+				var entryIndex = counterIndex;
 
-	            if (entry is DirectoryFolder && entry.ParentFolderId == "root")
+				Debug.Console(2, this, "Entry{2:0000} Name: {0}, Folder ID: {1}, Type: {3}, ParentFolderId: {4}",
-	            {
+					entry.Name, entry.FolderId, entryIndex, entry.GetType().GetCType().FullName, entry.ParentFolderId);
-	                tokenArray[arrayIndex] = new XSigSerialToken(entryIndex, String.Format("[+] {0}", entry.Name));
 
-	                counterIndex++;
+				if (entry is DirectoryFolder)
-	                counterIndex++;
+				{
+					tokenArray[arrayIndex] = new XSigSerialToken(entryIndex, String.Format("[+] {0}", entry.Name));
 
-	                continue;
+					counterIndex++;
-	            }
 
-	            tokenArray[arrayIndex] = new XSigSerialToken(entryIndex, entry.Name);
+					continue;
+				}
 
-	            counterIndex++;
+				tokenArray[arrayIndex] = new XSigSerialToken(entryIndex, entry.Name);
-	        }
-
-	        return GetXSigString(tokenArray);
 
+				counterIndex++;
+			}
 
+			return GetXSigString(tokenArray);
 		}
 
 	    private void LinkVideoCodecCallControlsToApi(BasicTriList trilist, VideoCodecControllerJoinMap joinMap)

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

@@ -303,11 +303,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					{
 						var contact = new InvitableDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
 
-                        contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
+                        contact.ContactMethods.Add(new ContactMethod()
+                        {
+	                        Number = c.Jid, 
+							Device = eContactMethodDevice.Video, 
+							CallType = eContactMethodCallType.Video, 
+							ContactMethodId = c.Jid
+                        });
 
 						if (folders.Count > 0)
 						{
-							contact.ParentFolderId = c.IsZoomRoom ? "rooms" : "contacts";
+							contact.ParentFolderId = c.IsZoomRoom
+								? roomFolder.FolderId // "rooms" 
+								: contactFolder.FolderId; // "contacts"
 						}
 
 						contacts.Add(contact);

packages.config

@@ -1,3 +1,3 @@
 <packages>
-	<package id="PepperDashCore" version="1.1.5-alpha-322" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+	<package id="PepperDashCore" version="1.2.0" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>