Updates to JoinMapBaseAdvanced constructor to properly add JoinDataComplete fields to Joins collection and to BridgeBase to implement console methods to print data at runtime.

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -101,6 +101,8 @@ namespace PepperDash.Essentials.Bridges
         public EiscApi(DeviceConfig dc) :
             base(dc.Key)
         {
+            JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
+
             PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
 
             Eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(PropertiesConfig.Control.IpIdInt, PropertiesConfig.Control.TcpSshProperties.Address, Global.ControlSystem);
@@ -119,11 +121,19 @@ namespace PepperDash.Essentials.Bridges
 
                     if (device != null)
                     {
+                        Debug.Console(1, this, "Linking Device: '{0}'", device.Key);
+
+
                         if (device is IBridge)      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
                         {
                             (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
+                        else if (device is IBridgeAdvanced)
+                        {
+                            Debug.Console(2, this, "'{0}' is IBridgeAdvanced", device.Key);
+                            (device as IBridgeAdvanced).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                        }
                         else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
                         {
                             (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
@@ -139,16 +149,18 @@ namespace PepperDash.Essentials.Bridges
                             (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                             continue;
                         }
-						else if (device is PepperDash.Essentials.Core.DisplayBase)
-						{
-							(device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
-							continue;
-						}
-                        else if (device is DmChassisController) {
+                        else if (device is PepperDash.Essentials.Core.DisplayBase)
+                        {
+                            (device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                            continue;
+                        }
+                        else if (device is DmChassisController)
+                        {
                             (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
-                        else if (device is DmBladeChassisController) {
+                        else if (device is DmBladeChassisController)
+                        {
                             (device as DmBladeChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             continue;
                         }
@@ -255,6 +267,7 @@ namespace PepperDash.Essentials.Bridges
 
             foreach (var joinMap in JoinMaps)
             {
+                Debug.Console(0, "Join map for device '{0}':", joinMap.Key);
                 joinMap.Value.PrintJoinMapInfo();
             }
         }
@@ -273,6 +286,7 @@ namespace PepperDash.Essentials.Bridges
                 return;
             }
 
+            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, this.Key); 
             joinMap.PrintJoinMapInfo();
         }
 

PepperDashEssentials/Bridges/IBridge.cs

@@ -7,10 +7,20 @@ using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Bridges
 {
+    /// <summary>
+    /// Defines a device that uses the legacy JoinMapBase for its join map
+    /// </summary>
+    [Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")]
     public interface IBridge
     {
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
+    }
 
+    /// <summary>
+    /// Defines a device that uses JoinMapBaseAdvanced for its join map
+    /// </summary>
+    public interface IBridgeAdvanced
+    {
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge);
     }
 }

PepperDashEssentials/ControlSystem.cs

@@ -51,7 +51,7 @@ namespace PepperDash.Essentials
 
             CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
 
-            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "gets map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
+            CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
 
             CrestronConsole.AddNewConsoleCommand(s =>
             {
@@ -290,12 +290,13 @@ namespace PepperDash.Essentials
         /// </summary>
         public void LoadDevices()
         {
+            // Instantiate the Device Factories
+            new CoreDeviceFactory();
+
+
             // Build the processor wrapper class
-
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
 
-
-
             // Add global System Monitor device
             DeviceManager.AddDevice(new PepperDash.Essentials.Core.Monitoring.SystemMonitorController("systemMonitor"));
 

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

@@ -34,8 +34,14 @@ namespace PepperDash.Essentials.Core
     {
         #region IDeviceFactory Members
 
+        /// <summary>
+        /// A list of strings that can be used in the type property of a DeviceConfig object to build an instance of this device
+        /// </summary>
         public List<string> TypeNames { get; protected set; }
 
+        /// <summary>
+        /// Loads an item to the DeviceFactory.FactoryMethods dictionary for each entry in the TypeNames list
+        /// </summary>
         public void LoadTypeFactories()
         {
             foreach (var typeName in TypeNames)
@@ -44,6 +50,11 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        /// <summary>
+        /// The method that will build the device
+        /// </summary>
+        /// <param name="dc">The device config</param>
+        /// <returns>An instance of the device</returns>
         public abstract EssentialsDevice BuildDevice(DeviceConfig dc);
 
         #endregion
@@ -54,6 +65,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
     {
+        /// <summary>
+        /// Specifies the minimum version of Essentials required for a plugin to run.  Must use the format Major.Minor.Build (ex. "1.4.33")
+        /// </summary>
         public string MinimumEssentialsFrameworkVersion { get; protected set; }
     }
 }

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

@@ -48,7 +48,6 @@ namespace PepperDash.Essentials.Core
 
             var typeName = dc.Type.ToLower();
 
-
             // Check for types that have been added by plugin dlls. 
             if (FactoryMethods.ContainsKey(typeName))
             {
@@ -57,11 +56,11 @@ namespace PepperDash.Essentials.Core
             }
 
 			// Check "core" types 
-            if (typeName == "genericcomm")
-            {
-                Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
-                return new GenericComm(dc);
-            }
+            //if (typeName == "genericcomm")
+            //{
+            //    Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
+            //    return new GenericComm(dc);
+            //}
             if (typeName == "ceniodigin104")
             {
                 var control = CommFactory.GetControlPropertiesConfig(dc);

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

@@ -88,14 +88,17 @@ namespace PepperDash.Essentials.Core
             // Get the joins of each type and print them
             Debug.Console(0, "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); 
             PrintJoinList(GetSortedJoins(digitals));
 
             Debug.Console(0, "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); 
             PrintJoinList(GetSortedJoins(analogs));
 
             Debug.Console(0, "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);
             PrintJoinList(GetSortedJoins(serials));
 
         }
@@ -166,24 +169,43 @@ namespace PepperDash.Essentials.Core
         /// <summary>
         /// The collection of joins and associated metadata
         /// </summary>
-        public Dictionary<string, JoinDataComplete> Joins = new Dictionary<string, JoinDataComplete>();
+        public Dictionary<string, JoinDataComplete> Joins { get; private set; }
 
         protected JoinMapBaseAdvanced(uint joinStart)
         {
+            Joins = new Dictionary<string, JoinDataComplete>();
+
             _joinOffset = joinStart - 1;
 
             // Add all the JoinDataComplete properties to the Joins Dictionary and pass in the offset 
-            Joins = GetType()
+            Joins = this.GetType()
                 .GetCType()
-                .GetProperties()
-                .Where(prop => prop.IsDefined(typeof(JoinNameAttribute), false))
-                .Select(prop => (JoinDataComplete)prop.GetValue(this, null))
-                .ToDictionary(join => join.GetNameAttribute(), join => 
+                .GetFields(BindingFlags.Public | BindingFlags.Instance)
+                .Where(field => field.IsDefined(typeof(JoinNameAttribute), false))
+                .Select(prop => (JoinDataComplete)prop.GetValue(this))
+                .ToDictionary(join => join.GetNameAttribute(), join =>
                     {
                         join.SetJoinOffset(_joinOffset);
                         return join;
                     });
 
+            //var type = this.GetType();
+            //var cType = type.GetCType();
+            //var fields = cType.GetFields(BindingFlags.Public | BindingFlags.Instance);
+            //foreach (var field in fields)
+            //{
+            //    if (field.IsDefined(typeof(JoinNameAttribute), true))
+            //    {
+            //        var value = field.GetValue(this) as JoinDataComplete;
+
+            //        if (value != null)
+            //        {
+            //            value.SetJoinOffset(_joinOffset);
+            //            Joins.Add(value.GetNameAttribute(), value);
+            //        }
+            //    }
+            //}
+
             PrintJoinMapInfo();
         }
 
@@ -197,14 +219,17 @@ namespace PepperDash.Essentials.Core
             // Get the joins of each type and print them
             Debug.Console(0, "Digitals:");
             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);
             PrintJoinList(GetSortedJoins(digitals));
 
             Debug.Console(0, "Analogs:");
             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);
             PrintJoinList(GetSortedJoins(analogs));
             
             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);
             PrintJoinList(GetSortedJoins(serials));
 
         }

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

@@ -161,7 +161,6 @@
     <Compile Include="Plugins\PluginLoader.cs" />
     <Compile Include="Presets\PresetBase.cs" />
     <Compile Include="Plugins\IPluginDeviceFactory.cs" />
-    <Compile Include="Plugins\PluginEntrypointAttribute.cs" />
     <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
     <Compile Include="Config\Comm and IR\CommFactory.cs" />
     <Compile Include="Config\Comm and IR\CommunicationExtras.cs" />

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

@@ -1,19 +0,0 @@
-using System;
-
-namespace PepperDash.Essentials.Core.Plugins
-{
-    [AttributeUsage(AttributeTargets.Class)]
-    public sealed class PluginEntryPointAttribute : Attribute
-    {
-        private readonly string _uniqueKey;
-
-        public string UniqueKey {
-            get { return _uniqueKey; }
-        }
-
-        public PluginEntryPointAttribute(string key)
-        {
-            _uniqueKey = key;
-        }
-    }
-}

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

@@ -8,7 +8,6 @@ using Crestron.SimplSharp.Reflection;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Plugins;
 
 namespace PepperDash.Essentials
 {