fix: wrong msbuild command

This reverts commit deb14c63e5.

.github/workflows/docker.yml

@@ -2,11 +2,6 @@ name: Branch Build Using Docker
 
 on:
   push:
-    branches:
-      - feature-2.0.0/*
-      - hotfix-2.0.0/*
-      - release-2.0.0/*
-      - development-2.0.0
 
 env:
   # solution path doesn't need slashes unless there it is multiple folders deep
@@ -22,7 +17,7 @@ env:
 jobs:
   Build_Project_4-Series:
     runs-on: windows-latest
-    steps:      
+    steps:
       - uses: actions/checkout@v3
       - name: Set Version Number
         id: setVersion
@@ -34,6 +29,8 @@ jobs:
           $phase = ""
           $newVersionString = ""
 
+          Write-Host "Current GitHub Ref: $Env:GITHUB_REF"
+
           switch -regex ($Env:GITHUB_REF) {
             '^refs\/pull\/*.' {
               $phase = 'beta';
@@ -57,28 +54,29 @@ jobs:
               $phase = 'beta'
               $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
             }  
-          }          
-          echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append      
+          }   
+
+          Write-Host "Version to be used: $newVersionString"
+          Write-Host "Build Phase: $phase"
+
+          echo "version=$newVersionString" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
       - name: Setup MS Build
         uses: microsoft/setup-msbuild@v1.1
       - name: restore Nuget Packages
         run: nuget restore .\$($Env:SOLUTION_FILE).sln
       # Build the solutions in the docker image
-      - name: Build Solution        
+      - name: Build Solution
         run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m
       - name: Pack Solution
         run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}"
       - name: Create tag for non-rc builds
-        if: contains(steps.setVersion.outputs.version, 'alpha')
+        if: ${{ !contains(steps.setVersion.outputs.version, 'rc') }}
         run: |
           git tag ${{ steps.setVersion.outputs.version }}
           git push --tags origin
       # Create the release on the source repo
       - name: Create Release
         id: create_release
-#        if: contains(steps.setVersion.outputs.version,'-rc-') ||
-#            contains(steps.setVersion.outputs.version,'-hotfix-') ||
-#            contains(steps.setVersion.outputs.version, '-beta-')
         uses: ncipollo/release-action@v1
         with:
           artifacts: 'output\**\*.*(cpz|cplz)'
@@ -86,11 +84,11 @@ jobs:
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
           tag: ${{ steps.setVersion.outputs.version }}
       - name: Setup Nuget
-        run: | 
+        run: |
           nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username pepperdash -password ${{ secrets.GITHUB_TOKEN }}
           nuget setApiKey ${{ secrets.GITHUB_TOKEN }} -Source github          
-          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json          
+          nuget setApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json
       - name: Publish to Nuget
         run: nuget push .\output\*.nupkg -Source https://api.nuget.org/v3/index.json
       - name: Publish to Github Nuget
-        run: nuget push .\output\*.nupkg -Source github
+        run: nuget push .\output\*.nupkg -Source github

.releaserc.json

@@ -0,0 +1,54 @@
+{
+  "branches": [
+    {
+      "name": "development-2.0.0",
+      "prerelease": true
+    },
+    {
+      "name": "feature-2.0.0/*",
+      "prerelease": "beta"
+    },
+    {
+      "name": "hotfix-2.0.0/*",
+      "prerelease": "patch"
+    },
+    {
+      "name": "release-2.0.0/*",
+      "prerelease": "rc"
+    }
+  ],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/release-notes-generator",
+      {
+        "preset": "conventionalcommits",
+        "presetConfig": {
+          "types": [
+            { "type": "feat", "section": "🚀 Features" },
+            { "type": "fix", "section": "🐛 Bug Fixes" },
+            { "type": "chore", "section": "🧹 Maintenance" },
+            { "type": "docs", "section": "📚 Documentation" },
+            { "type": "style", "section": "💎 Code Style" },
+            { "type": "refactor", "section": "🔨 Refactoring" },
+            { "type": "perf", "section": "⚡ Performance Improvements" },
+            { "type": "test", "section": "✅ Tests" }
+          ]
+        }
+      }
+    ],
+    [
+      "@semantic-release/changelog",
+      {
+        "changelogTitle": "# 📦 Release History\n\nAll notable changes to this project will be documented in this file."
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "verifyReleaseCmd": "echo \"newVersion=true\" >> $GITHUB_OUTPUT",
+        "publishCmd": "echo \"version=${nextRelease.version}\" >> $GITHUB_OUTPUT && echo \"tag=${nextRelease.gitTag}\" >> $GITHUB_OUTPUT && echo \"type=${nextRelease.type}\" >> $GITHUB_OUTPUT && echo \"channel=${nextRelease.channel}\" >> $GITHUB_OUTPUT"
+      }
+    ]
+  ]
+}

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -18,81 +18,6 @@ using Serilog.Events;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
-    /// <summary>
-    /// Helper methods for bridges
-    /// </summary>
-    public static class BridgeHelper
-    {
-        public static void PrintJoinMap(string command)
-        {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.PrintJoinMapForDevice(deviceKey);
-            }
-            else
-            {
-                bridge.PrintJoinMaps();
-            }
-        }
-        public static void JoinmapMarkdown(string command)
-        {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
-            }
-            else
-            {
-                bridge.MarkdownForBridge(bridgeKey);
-
-            }
-        }
-    }
-
-
-    /// <summary>
-    /// Base class for all bridge class variants
-    /// </summary>
-    public class BridgeBase : EssentialsDevice
-    {
-        public BridgeApi Api { get; protected set; }
-
-        public BridgeBase(string key) :
-            base(key)
-        {
-
-        }
-    }
-
     /// <summary>
     /// Base class for bridge API variants
     /// </summary>
@@ -168,19 +93,15 @@ namespace PepperDash.Essentials.Core.Bridges
 
                 Debug.LogMessage(LogEventLevel.Debug, this, "Linking Device: '{0}'", device.Key);
 
-                if (!typeof(IBridgeAdvanced).IsAssignableFrom(device.GetType().GetType()))
+                if (device is IBridgeAdvanced bridge)
                 {
-                    Debug.LogMessage(LogEventLevel.Information, this,
-                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                        device.Key);
+                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                     continue;
                 }
 
-                var bridge = device as IBridgeAdvanced;
-                if (bridge != null)
-                {
-                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
-                }
+                Debug.LogMessage(LogEventLevel.Information, this,
+                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                        device.Key);
             }
         }
 
@@ -249,11 +170,11 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public virtual void PrintJoinMaps()
         {
-            Debug.LogMessage(LogEventLevel.Information, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
+            CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
 
             foreach (var joinMap in JoinMaps)
             {
-                Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}':", joinMap.Key);
+                CrestronConsole.ConsoleCommandResponse("Join map for device '{0}':", joinMap.Key);
                 joinMap.Value.PrintJoinMapInfo();
             }
         }

src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs

@@ -0,0 +1,66 @@
+using PepperDash.Core;
+using Serilog.Events;
+
+//using PepperDash.Essentials.Devices.Common.Cameras;
+
+namespace PepperDash.Essentials.Core.Bridges
+{
+    /// <summary>
+    /// Helper methods for bridges
+    /// </summary>
+    public static class BridgeHelper
+    {
+        public static void PrintJoinMap(string command)
+        {
+            var targets = command.Split(' ');
+
+            var bridgeKey = targets[0].Trim();
+
+            if (!(DeviceManager.GetDeviceForKey(bridgeKey) is EiscApiAdvanced bridge))
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                var deviceKey = targets[1].Trim();
+
+                if (string.IsNullOrEmpty(deviceKey)) return;
+                bridge.PrintJoinMapForDevice(deviceKey);
+            }
+            else
+            {
+                bridge.PrintJoinMaps();
+            }
+        }
+        public static void JoinmapMarkdown(string command)
+        {
+            var targets = command.Split(' ');
+
+            var bridgeKey = targets[0].Trim();
+
+            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
+
+            if (bridge == null)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+                return;
+            }
+
+            if (targets.Length > 1)
+            {
+                var deviceKey = targets[1].Trim();
+
+                if (string.IsNullOrEmpty(deviceKey)) return;
+                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
+            }
+            else
+            {
+                bridge.MarkdownForBridge(bridgeKey);
+
+            }
+        }
+    }
+
+}

src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs

@@ -93,6 +93,7 @@ namespace PepperDash.Essentials.Core
 
         void OnDataReceived(string s)
         {
+			var eventSubscribed = false;
 
             var bytesHandler = BytesReceived;
             if (bytesHandler != null)
@@ -101,7 +102,7 @@ namespace PepperDash.Essentials.Core
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
 					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes));
                 bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
-				return;
+				eventSubscribed = true;
             }
             var textHandler = TextReceived;
             if (textHandler != null)
@@ -109,10 +110,10 @@ namespace PepperDash.Essentials.Core
 				if (StreamDebugging.RxStreamDebuggingIsEnabled)
 					Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s);
                 textHandler(this, new GenericCommMethodReceiveTextArgs(s));
-				return;
+				eventSubscribed = true;
             }
 
-			Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
+			if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
         }
 
 		public override bool Deactivate()

src/PepperDash.Essentials.Core/Config/BasicConfig.cs

@@ -55,7 +55,7 @@ namespace PepperDash.Essentials.Core.Config
 		/// </summary>
 		public Dictionary<string, SourceListItem> GetSourceListForKey(string key)
 		{
-			if (string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key))
+			if (SourceLists == null || string.IsNullOrEmpty(key) || !SourceLists.ContainsKey(key))
 				return null;
 			
 			return SourceLists[key];
@@ -68,7 +68,7 @@ namespace PepperDash.Essentials.Core.Config
         /// <returns>DestinationList if the key exists, null otherwise</returns>
 	    public Dictionary<string, DestinationListItem> GetDestinationListForKey(string key)
 	    {
-	        if (string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
+	        if (DestinationLists == null || string.IsNullOrEmpty(key) || !DestinationLists.ContainsKey(key))
 	        {
 	            return null;
 	        }
@@ -83,7 +83,7 @@ namespace PepperDash.Essentials.Core.Config
         /// <returns>AudioControlPointList if the key exists, null otherwise</returns>
         public AudioControlPointListItem GetAudioControlPointListForKey(string key)
         {
-            if (string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
+            if (AudioControlPointLists == null ||  string.IsNullOrEmpty(key) || !AudioControlPointLists.ContainsKey(key))
                 return null;
 
             return AudioControlPointLists[key];
@@ -94,7 +94,7 @@ namespace PepperDash.Essentials.Core.Config
         /// </summary>
         public Dictionary<string, CameraListItem> GetCameraListForKey(string key)
         {
-            if (string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
+            if (CameraLists == null || string.IsNullOrEmpty(key) || !CameraLists.ContainsKey(key))
                 return null;
 
             return CameraLists[key];

src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs

@@ -31,9 +31,17 @@ namespace PepperDash.Essentials.Core.Config
 				if (string.IsNullOrEmpty(SystemUrl))
 					return "missing url";
 
-                var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
-                string uuid = result.Groups[1].Value;
-                return uuid;
+				if (SystemUrl.Contains("#"))
+				{
+					var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/#.*");
+					string uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
+                    var result = Regex.Match(SystemUrl, @"https?:\/\/.*\/systems\/(.*)\/.*");
+                    string uuid = result.Groups[1].Value;
+                    return uuid;
+                }
             }
         }
 
@@ -44,10 +52,18 @@ namespace PepperDash.Essentials.Core.Config
             {
 				if (string.IsNullOrEmpty(TemplateUrl))
 					return "missing template url";
-       
-				var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
-                string uuid = result.Groups[1].Value;
-                return uuid;
+
+				if (TemplateUrl.Contains("#"))
+				{
+					var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/templates\/(.*)\/#.*");
+					string uuid = result.Groups[1].Value;
+					return uuid;
+				} else
+				{
+                    var result = Regex.Match(TemplateUrl, @"https?:\/\/.*\/system-templates\/(.*)\/system-template-versions\/(.*)\/.*");
+                    string uuid = result.Groups[2].Value;
+                    return uuid;
+                }
             }
         }
 

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IHumiditySensor
+    {
+        /// <summary>
+        ///  Reports the relative humidity level. Level ranging from 0 to 100 (for 0% to 100%
+        ///  RH). EventIds: HumidityFeedbackFeedbackEventId will trigger to indicate change.
+        /// </summary>
+        IntFeedback HumidityFeedback { get; }
+
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface ITemperatureSensor
+    {
+        /// <summary>
+        ///  The values will range from -400 to +1760 (for -40° to +176° F) or -400 to +800
+        ///    (for -40° to +80° C)in tenths of a degree.
+        /// </summary>
+        IntFeedback TemperatureFeedback { get; }
+
+
+        BoolFeedback TemperatureInCFeedback { get; }
+
+        void SetTemperatureFormat(bool setToC);
+    }
+}

src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs

@@ -9,9 +9,15 @@ namespace PepperDash.Essentials.Core
 {
     public abstract class AudioControlListItemBase
     {
+        /// <summary>
+        /// Key of the parent device in the DeviceManager
+        /// </summary>
         [JsonProperty("parentDeviceKey")]
         public string ParentDeviceKey { get; set; }
 
+        /// <summary>
+        /// Optional key of the item in the parent device
+        /// </summary>
         [JsonProperty("itemKey")]
         public string ItemKey { get; set; }
 

src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs

@@ -206,7 +206,7 @@ namespace PepperDash.Essentials.Core
             if (dev == null)
                 return "{ \"error\":\"No Device\"}";
 
-            object prop = dev.GetType().GetType().GetProperty(propertyName).GetValue(dev, null);
+            object prop = dev.GetType().GetProperty(propertyName).GetValue(dev, null);
 
             // var prop = t.GetProperty(propertyName);
             if (prop != null)

src/PepperDash.Essentials.Core/Devices/DeviceManager.cs

@@ -14,6 +14,7 @@ namespace PepperDash.Essentials.Core
     {
         public static event EventHandler<EventArgs> AllDevicesActivated;
         public static event EventHandler<EventArgs> AllDevicesRegistered;
+        public static event EventHandler<EventArgs> AllDevicesInitialized;
 
         private static readonly CCriticalSection DeviceCriticalSection = new CCriticalSection();
         private static readonly CEvent AllowAddDevicesCEvent = new CEvent(false, true);
@@ -67,7 +68,7 @@ namespace PepperDash.Essentials.Core
                 foreach (var d in Devices.Values)
                 {
                     try
-                    {
+                    { 
                         if (d is Device)
                             (d as Device).PreActivate();
                     }
@@ -123,6 +124,18 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        private static void DeviceManager_Initialized(object sender, EventArgs e)
+        {
+            var allInitialized = Devices.Values.OfType<EssentialsDevice>().All(d => d.IsInitialized);
+
+            if (allInitialized)
+            {
+                Debug.LogMessage(LogEventLevel.Information, "****All Devices Initalized****");
+
+                OnAllDevicesInitialized();
+            }
+        }
+
         private static void OnAllDevicesActivated()
         {
             var handler = AllDevicesActivated;
@@ -141,6 +154,15 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        private static void OnAllDevicesInitialized()
+        {
+            var handler = AllDevicesInitialized;
+            if (handler != null)
+            {
+                handler(null, new EventArgs());
+            }
+        }
+
         /// <summary>
         /// Calls activate on all Device class items
         /// </summary>
@@ -264,6 +286,9 @@ namespace PepperDash.Essentials.Core
                 Devices.Add(newDev.Key, newDev);
                 //if (!(_Devices.Contains(newDev)))
                 //    _Devices.Add(newDev);
+
+                if (newDev is EssentialsDevice essentialsDev)
+                    essentialsDev.Initialized += DeviceManager_Initialized;
             }
             finally
             {

src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs

@@ -17,6 +17,24 @@ namespace PepperDash.Essentials.Core
     [Description("The base Essentials Device Class")]
     public abstract class EssentialsDevice : Device
     {
+        public event EventHandler Initialized;
+
+        private bool _isInitialized;
+        public bool IsInitialized { 
+            get { return _isInitialized; }
+            private set 
+            { 
+                if (_isInitialized == value) return;
+                
+                _isInitialized = value;
+
+                if (_isInitialized)
+                {
+                    Initialized?.Invoke(this, new EventArgs());
+                }
+            } 
+        }
+
         protected EssentialsDevice(string key)
             : base(key)
         {
@@ -41,6 +59,8 @@ namespace PepperDash.Essentials.Core
                 try
                 {
                     Initialize();
+
+                    IsInitialized = true;
                 }
                 catch (Exception ex)
                 {

src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs

@@ -51,8 +51,18 @@ namespace PepperDash.Essentials.Core
         /// The key of the device in the DeviceManager for control
         /// </summary>
         [JsonProperty("deviceKey")]
-        public string DeviceKey => DeviceManager.AllDevices.
-            Where(d => d.Key.Contains(ParentDeviceKey) && d.Key.Contains(ItemKey)).FirstOrDefault()?.Key ?? $"{ParentDeviceKey}--{ItemKey}";
+        public string DeviceKey
+        {
+            get
+            {
+                if(string.IsNullOrEmpty(ItemKey)) return ParentDeviceKey;
+                else
+                {
+                    return DeviceManager.AllDevices.
+                    Where(d => d.Key.Contains(ParentDeviceKey) && d.Key.Contains(ItemKey)).FirstOrDefault()?.Key ?? $"{ParentDeviceKey}--{ItemKey}";
+                }
+            }
+        }
 
         /// <summary>
         /// Indicates if the item is a level, mute , or both

src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs

@@ -107,19 +107,20 @@ namespace PepperDash.Essentials.Core
         }
 
         protected void AddJoins(Type type)
-        {
+        {            
             var fields =
-                type.GetType()
-                    .GetFields(BindingFlags.Public | BindingFlags.Instance)
-                    .Where(f => f.IsDefined(typeof (JoinNameAttribute), true));
+                type.GetFields(BindingFlags.Public | BindingFlags.Instance)
+                    .Where(f => f.IsDefined(typeof (JoinNameAttribute), true)).ToList();
+
+            Debug.LogMessage(LogEventLevel.Debug, "Got {fields} with JoinNameAttribute", fields.Count);
 
             foreach (var field in fields)
             {
                 var childClass = Convert.ChangeType(this, type, null);
 
-                var value = field.GetValue(childClass) as JoinDataComplete; //this here is JoinMapBaseAdvanced, not the child class. JoinMapBaseAdvanced has no fields.
+                //this here is JoinMapBaseAdvanced, not the child class. JoinMapBaseAdvanced has no fields.
 
-                if (value == null)
+                if (!(field.GetValue(childClass) is JoinDataComplete value))
                 {
                     Debug.LogMessage(LogEventLevel.Information, "Unable to cast base class to {0}", type.Name);
                     continue;
@@ -129,7 +130,7 @@ namespace PepperDash.Essentials.Core
 
                 var joinName = value.GetNameAttribute(field);
 
-                if (String.IsNullOrEmpty(joinName)) continue;
+                if (string.IsNullOrEmpty(joinName)) continue;
 
                 Joins.Add(joinName, value);
             }
@@ -155,29 +156,37 @@ namespace PepperDash.Essentials.Core
         {
             var sb = new StringBuilder();
 
-            // Get the joins of each type and print them
-            sb.AppendLine(String.Format("# {0}", GetType().Name));
-            sb.AppendLine();
-            sb.AppendLine("## 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();
+            var lineEnding = "\r\n";
 
-            var analogs =
-                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Analog) == eJoinType.Analog)
+            var digitals =
+                Joins.Where(j => j.Value.Metadata.JoinType.HasFlag(eJoinType.Digital))
+                    .ToDictionary(j => j.Key, j => j.Value);
+
+            var analogs = Joins.Where(j => j.Value.Metadata.JoinType.HasFlag(eJoinType.Analog))
                     .ToDictionary(j => j.Key, j => j.Value);
-            var analogSb = AppendJoinList(GetSortedJoins(analogs));
-            analogSb.AppendLine("## Serials");
-            analogSb.AppendLine();
 
             var serials =
-                Joins.Where(j => (j.Value.Metadata.JoinType & eJoinType.Serial) == eJoinType.Serial)
+                Joins.Where(j => j.Value.Metadata.JoinType.HasFlag(eJoinType.Serial))
                     .ToDictionary(j => j.Key, j => j.Value);
+
+            Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Digital join count {digitalCount} Analog join count {analogCount} Serial join count {serialCount}", null, digitals.Count, analogs.Count, serials.Count);
+
+            // Get the joins of each type and print them
+            sb.Append($"# {GetType().Name}\r\n");
+            sb.Append(lineEnding);
+            sb.Append($"## Digitals{lineEnding}");
+            sb.Append(lineEnding);
+            // Get the joins of each type and print them
+            
+            var digitalSb = AppendJoinList(GetSortedJoins(digitals));
+            digitalSb.Append($"## Analogs{lineEnding}");
+            digitalSb.Append(lineEnding);
+            
+            var analogSb = AppendJoinList(GetSortedJoins(analogs));
+            analogSb.Append($"## Serials{lineEnding}");
+            analogSb.Append(lineEnding);
+
+            
             var serialSb = AppendJoinList(GetSortedJoins(serials));
 
             sb.EnsureCapacity(sb.Length + digitalSb.Length + analogSb.Length + serialSb.Length);
@@ -202,7 +211,7 @@ namespace PepperDash.Essentials.Core
 
         private static void WriteJoinmapMarkdown(StringBuilder stringBuilder, string pluginType, string bridgeKey, string deviceKey)
         {
-            var fileName = String.Format("{0}{1}{2}__{3}__{4}.md", Global.FilePathPrefix, "joinMaps/", pluginType, bridgeKey, deviceKey);
+            var fileName = string.Format("{0}{1}{2}__{3}__{4}.md", Global.FilePathPrefix, "joinMaps/", pluginType, bridgeKey, deviceKey);
 
             using (var sw = new StreamWriter(fileName))
             {
@@ -230,7 +239,7 @@ namespace PepperDash.Essentials.Core
         static StringBuilder AppendJoinList(List<KeyValuePair<string, JoinDataComplete>> joins)
         {
             var sb = new StringBuilder();
-            const string stringFormatter = "| {0} | {1} | {2} | {3} | {4} |";
+            const string stringFormatter = "| {0} | {1} | {2} | {3} | {4} |\r\n";
             const int joinNumberLen = 11;
             const int joinSpanLen = 9;
             const int typeLen = 19;
@@ -238,25 +247,25 @@ namespace PepperDash.Essentials.Core
             var descriptionLen = (from @join in joins select @join.Value into j select j.Metadata.Description.Length).Concat(new[] {11}).Max();
 
             //build header
-            sb.AppendLine(String.Format(stringFormatter, 
-                String.Format("Join Number").PadRight(joinNumberLen, ' '), 
-                String.Format("Join Span").PadRight(joinSpanLen, ' '), 
-                String.Format("Description").PadRight(descriptionLen, ' '), 
-                String.Format("Type").PadRight(typeLen, ' '),
-                 String.Format("Capabilities").PadRight(capabilitiesLen, ' ')));
+            sb.Append(string.Format(stringFormatter,
+                string.Format("Join Number").PadRight(joinNumberLen, ' '),
+                string.Format("Join Span").PadRight(joinSpanLen, ' '),
+                string.Format("Description").PadRight(descriptionLen, ' '),
+                string.Format("Type").PadRight(typeLen, ' '),
+                 string.Format("Capabilities").PadRight(capabilitiesLen, ' ')));
             //build table seperator
-            sb.AppendLine(String.Format(stringFormatter,
-                new String('-', joinNumberLen),
-                new String('-', joinSpanLen),
-                new String('-', descriptionLen),
-                new String('-', typeLen),
-                new String('-', capabilitiesLen)));
+            sb.Append(string.Format(stringFormatter,
+                new string('-', joinNumberLen),
+                new string('-', joinSpanLen),
+                new string('-', descriptionLen),
+                new string('-', typeLen),
+                new string('-', capabilitiesLen)));
 
             foreach (var join in joins)
             {
-                sb.AppendLine(join.Value.GetMarkdownFormattedData(stringFormatter, descriptionLen));
+                sb.Append(join.Value.GetMarkdownFormattedData(stringFormatter, descriptionLen));
             }
-            sb.AppendLine();
+            sb.Append("\r\n");
             return sb;
         }
 
@@ -411,10 +420,10 @@ namespace PepperDash.Essentials.Core
         {
 
             //Fixed Width Headers
-            var joinNumberLen = String.Format("Join Number").Length;
-            var joinSpanLen = String.Format("Join Span").Length;
-            var typeLen = String.Format("AnalogDigitalSerial").Length;
-            var capabilitiesLen = String.Format("ToFromFusion").Length;
+            var joinNumberLen = string.Format("Join Number").Length;
+            var joinSpanLen = string.Format("Join Span").Length;
+            var typeLen = string.Format("AnalogDigitalSerial").Length;
+            var capabilitiesLen = string.Format("ToFromFusion").Length;
 
             //Track which one failed, if it did
             const string placeholder = "unknown";
@@ -430,13 +439,13 @@ namespace PepperDash.Essentials.Core
 
             try
             {
-                dataArray["joinNumber"] = String.Format("{0}", JoinNumber.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinNumberLen, ' ');
-                dataArray["joinSpan"] = String.Format("{0}", JoinSpan.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinSpanLen, ' ');
-                dataArray["description"] = String.Format("{0}", Metadata.Description.ReplaceIfNullOrEmpty(placeholder)).PadRight(descriptionLen, ' ');
-                dataArray["joinType"] = String.Format("{0}", Metadata.JoinType.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(typeLen, ' ');
-                dataArray["capabilities"] = String.Format("{0}", Metadata.JoinCapabilities.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(capabilitiesLen, ' ');
+                dataArray["joinNumber"] = string.Format("{0}", JoinNumber.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinNumberLen, ' ');
+                dataArray["joinSpan"] = string.Format("{0}", JoinSpan.ToString(CultureInfo.InvariantCulture).ReplaceIfNullOrEmpty(placeholder)).PadRight(joinSpanLen, ' ');
+                dataArray["description"] = string.Format("{0}", Metadata.Description.ReplaceIfNullOrEmpty(placeholder)).PadRight(descriptionLen, ' ');
+                dataArray["joinType"] = string.Format("{0}", Metadata.JoinType.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(typeLen, ' ');
+                dataArray["capabilities"] = string.Format("{0}", Metadata.JoinCapabilities.ToString().ReplaceIfNullOrEmpty(placeholder)).PadRight(capabilitiesLen, ' ');
 
-                return String.Format(stringFormatter,
+                return string.Format(stringFormatter,
                     dataArray["joinNumber"],
                     dataArray["joinSpan"],
                     dataArray["description"],
@@ -454,8 +463,8 @@ namespace PepperDash.Essentials.Core
                     errorKey = item.Key;
                     break;
                 }
-                Debug.LogMessage(LogEventLevel.Information, "Unable to decode join metadata {1}- {0}", e.Message, !String.IsNullOrEmpty(errorKey) ? (' ' + errorKey) : String.Empty);
-                return String.Format(stringFormatter,
+                Debug.LogMessage(LogEventLevel.Information, "Unable to decode join metadata {1}- {0}", e.Message, !string.IsNullOrEmpty(errorKey) ? (' ' + errorKey) : string.Empty);
+                return string.Format(stringFormatter,
                     dataArray["joinNumber"],
                     dataArray["joinSpan"],
                     dataArray["description"],
@@ -520,7 +529,7 @@ namespace PepperDash.Essentials.Core
 
         public JoinNameAttribute(string name)
         {
-            Debug.LogMessage(LogEventLevel.Verbose, "Setting Attribute Name: {0}", name);
+            Debug.LogMessage(LogEventLevel.Verbose, "Setting Attribute Name: {0}",null, name);
             _Name = name;
         }
 

src/PepperDash.Essentials.Core/Presets/DevicePresets.cs

@@ -130,6 +130,8 @@ namespace PepperDash.Essentials.Core.Presets
                     var pl = JsonConvert.DeserializeObject<PresetsList>(File.ReadToEnd(_filePath, Encoding.ASCII));
                     Name = pl.Name;
                     PresetsList = pl.Channels;
+
+                    Debug.LogMessage(LogEventLevel.Verbose, this, "Loaded {0} presets", PresetsList.Count);
                 }
                 catch (Exception e)
                 {

src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs

@@ -84,7 +84,15 @@ namespace PepperDash.Essentials.Core
                 SetupPartitionStateProviders();
 
                 SetRooms();
+            });
 
+
+            // Subscribe to the AllDevicesInitialized event
+            // We need to wait until all devices are initialized in case
+            // any actions are dependent on 3rd party devices already being
+            // connected and initialized
+            DeviceManager.AllDevicesInitialized += (o, a) =>
+            {
                 if (IsInAutoMode)
                 {
                     DetermineRoomCombinationScenario();
@@ -93,7 +101,7 @@ namespace PepperDash.Essentials.Core
                 {
                     SetRoomCombinationScenario(_propertiesConfig.defaultScenarioKey);
                 }
-            });
+            };
         }
 
         private void CreateScenarios()

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -61,12 +61,13 @@ namespace PepperDash.Essentials.Core
                 SignalType = signalType
             };
 
-            var coolingDevice = destination as IWarmingCooling;
+            
 
+            var coolingDevice = destination as IWarmingCooling;
 
             //We already have a route request for this device, and it's a cooling device and is cooling
             if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
+            {                
                 coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
 
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
@@ -80,20 +81,23 @@ namespace PepperDash.Essentials.Core
 
             //New Request
             if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= routeRequest.HandleCooldown;
-
+            {               
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
 
                 RouteRequests.Add(destination.Key, routeRequest);
 
-                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is cooling down.  Storing route request to route to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
+                Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is cooling down. Storing route request to route to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
                 return;
             }
 
             if (RouteRequests.ContainsKey(destination.Key) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == false)
             {
+                var handledRequest = RouteRequests[destination.Key];
+
+                coolingDevice.IsCoolingDownFeedback.OutputChange -= handledRequest.HandleCooldown;
+
                 RouteRequests.Remove(destination.Key);
+
                 Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
             }
 

src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs

@@ -68,19 +68,29 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public void ReleaseRoutes()
 		{
-			foreach (var route in Routes.Where(r => r.SwitchingDevice is IRouting))
-			{
-				if (route.SwitchingDevice is IRouting switchingDevice)
-				{
+            foreach (var route in Routes.Where(r => r.SwitchingDevice is IRouting))
+            {
+                if (route.SwitchingDevice is IRouting switchingDevice)
+                {
+                    if (route.OutputPort == null)
+                    {
+                        continue;
+                    }
+
                     switchingDevice.ExecuteSwitch(null, route.OutputPort.Selector, SignalType);
 
-					// Pull the route from the port.  Whatever is watching the output's in use tracker is
-					// responsible for responding appropriately.
-					route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);
-					Debug.LogMessage(LogEventLevel.Verbose, "Port {0} releasing. Count={1}",null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
-				}
-			}
-		}
+                    if (route.OutputPort.InUseTracker != null)
+                    {
+                        route.OutputPort.InUseTracker.RemoveUser(Destination, "destination-" + SignalType);
+                        Debug.LogMessage(LogEventLevel.Verbose, "Port {0} releasing. Count={1}", null, route.OutputPort.Key, route.OutputPort.InUseTracker.InUseCountFeedback.UShortValue);
+                    }
+                    else
+                    {
+                        Debug.LogMessage(LogEventLevel.Error, "InUseTracker is null for OutputPort {0}", null, route.OutputPort.Key);
+                    }
+                }
+            }
+        }
 
 		public override string ToString()
 		{

src/PepperDash.Essentials.Core/Routing/RouteRequest.cs

@@ -1,5 +1,6 @@
 using PepperDash.Core;
 using Serilog.Events;
+using System;
 
 namespace PepperDash.Essentials.Core
 {
@@ -14,20 +15,27 @@ namespace PepperDash.Essentials.Core
 
         public void HandleCooldown(object sender, FeedbackEventArgs args)
         {
-            Debug.LogMessage(LogEventLevel.Information, "Handling cooldown route request: {destination}:{destinationPort} -> {source}:{sourcePort} {type}", null, Destination.Key, DestinationPort.Key, Source.Key, SourcePort.Key, SignalType.ToString());
-
-            if (args.BoolValue == true)
+            try
             {
-                return;
-            }
+                Debug.LogMessage(LogEventLevel.Information, "Handling cooldown route request: {destination}:{destinationPort} -> {source}:{sourcePort} {type}", null, Destination?.Key ?? "empty destination", DestinationPort?.Key ?? "no destination port", Source?.Key ?? "empty source", SourcePort?.Key ?? "empty source port", SignalType.ToString());
 
-            Debug.LogMessage(LogEventLevel.Information, "Cooldown complete. Making route from {destination} to {source}", Destination.Key, Source.Key);
-            Destination.ReleaseAndMakeRoute(Source, SignalType, DestinationPort?.Key ?? string.Empty, SourcePort?.Key ?? string.Empty);
+                if (args.BoolValue == true)
+                {
+                    return;
+                }
 
-            if (sender is IWarmingCooling coolingDevice)
+                Debug.LogMessage(LogEventLevel.Information, "Cooldown complete. Making route from {destination} to {source}", Destination?.Key, Source?.Key);
+
+                Destination.ReleaseAndMakeRoute(Source, SignalType, DestinationPort?.Key ?? string.Empty, SourcePort?.Key ?? string.Empty);
+
+                if (sender is IWarmingCooling coolingDevice)
+                {
+                    Debug.LogMessage(LogEventLevel.Debug, "Unsubscribing from cooling feedback for {destination}", null, Destination.Key);
+                    coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
+                }
+            } catch(Exception ex)
             {
-                Debug.LogMessage(LogEventLevel.Debug, "Unsubscribing from cooling feedback for {destination}", null, Destination.Key);
-                coolingDevice.IsCoolingDownFeedback.OutputChange -= HandleCooldown;
+                Debug.LogMessage(ex, "Exception handling cooldown", Destination);
             }
         }
     }

src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs

@@ -5,7 +5,7 @@
     /// </summary>
     public class RouteSwitchDescriptor
 	{
-		public IRoutingInputs SwitchingDevice { get { return InputPort.ParentDevice; } }
+		public IRoutingInputs SwitchingDevice { get { return InputPort?.ParentDevice; } }
 		public RoutingOutputPort OutputPort { get; set; }
 		public RoutingInputPort InputPort { get; set; }
 
@@ -23,9 +23,9 @@
 		public override string ToString()
 		{
             if (SwitchingDevice is IRouting)
-                return $"{SwitchingDevice?.Key} switches output {OutputPort.Key} to input {InputPort.Key}";
+                return $"{(SwitchingDevice != null ? SwitchingDevice.Key : "No Device")} switches output {(OutputPort != null ? OutputPort.Key : "No output port")} to input {(InputPort != null ? InputPort.Key : "No input port")}";
             else
-                return $"{SwitchingDevice.Key} switches to input {InputPort.Key}";
+                return $"{(SwitchingDevice != null ? SwitchingDevice.Key : "No Device")} switches to input {(InputPort != null ? InputPort.Key : "No input port")}";
 		}
 	}
 

src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs

@@ -65,7 +65,7 @@ namespace PepperDash.Essentials.Core.Routing
 
         private void UpdateDestination(IRoutingSinkWithSwitching destination, RoutingInputPort inputPort)
         {            
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this,destination?.Key, inputPort?.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this,destination?.Key, inputPort?.Key);
 
             if(inputPort == null)
             {
@@ -101,7 +101,7 @@ namespace PepperDash.Essentials.Core.Routing
                 return;
             }
 
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Getting source for first TieLine {tieLine}", this, firstTieLine);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Getting source for first TieLine {tieLine}", this, firstTieLine);
 
             TieLine sourceTieLine;
             try
@@ -128,7 +128,7 @@ namespace PepperDash.Essentials.Core.Routing
                 return;
             }
 
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);           
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);           
 
             // Does not handle combinable scenarios or other scenarios where a display might be part of multiple rooms yet.
             var room = DeviceManager.AllDevices.OfType<IEssentialsRoom>().FirstOrDefault((r) => {
@@ -151,7 +151,7 @@ namespace PepperDash.Essentials.Core.Routing
                 return;
             }
 
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found room {room} for destination {destination}", this, room.Key, destination.Key);
 
             var sourceList = ConfigReader.ConfigObject.GetSourceListForKey(room.SourceListKey);
 
@@ -161,20 +161,21 @@ namespace PepperDash.Essentials.Core.Routing
                 return;
             }
 
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);
 
             var sourceListItem = sourceList.FirstOrDefault(sli => {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
-                    "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
-                    this,
-                    sli.Key,
-                    sli.Value.SourceKey,
-                    sourceTieLine.SourcePort.ParentDevice.Key);
+                 //// Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
+                 //   "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
+                 //   this,
+                 //   sli.Key,
+                 //   sli.Value.SourceKey,
+                 //   sourceTieLine.SourcePort.ParentDevice.Key);
 
                 return sli.Value.SourceKey.Equals(sourceTieLine.SourcePort.ParentDevice.Key,StringComparison.InvariantCultureIgnoreCase);
             });            
 
             var source = sourceListItem.Value;
+            var sourceKey = sourceListItem.Key;
 
             if (source == null)
             {
@@ -186,15 +187,16 @@ namespace PepperDash.Essentials.Core.Routing
                     Name = sourceTieLine.SourcePort.Key,
                 };
 
-                destination.CurrentSourceInfo = tempSourceListItem; ;
                 destination.CurrentSourceInfoKey = "$transient";
+                destination.CurrentSourceInfo = tempSourceListItem;                
                 return;
             }
 
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {source}", this, source);
+            //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {@source} with key {sourceKey}", this, source, sourceKey);
 
+            destination.CurrentSourceInfoKey = sourceKey;
             destination.CurrentSourceInfo = source;
-            destination.CurrentSourceInfoKey = source.SourceKey;
+            
         }
 
         private TieLine GetRootTieLine(TieLine tieLine)
@@ -202,11 +204,11 @@ namespace PepperDash.Essentials.Core.Routing
             TieLine nextTieLine = null;
             try
             {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "**Following tieLine {tieLine}**", this, tieLine);
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "**Following tieLine {tieLine}**", this, tieLine);
 
                 if (tieLine.SourcePort.ParentDevice is IRoutingWithFeedback midpoint)
                 {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source device {sourceDevice} is midpoint", this, midpoint);
+                    // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source device {sourceDevice} is midpoint", this, midpoint);
 
                     if(midpoint.CurrentRoutes == null || midpoint.CurrentRoutes.Count == 0)
                     {
@@ -215,9 +217,9 @@ namespace PepperDash.Essentials.Core.Routing
                     }
 
                     var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route => {
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine);
+                        //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine);
 
-                        return route.OutputPort.Key == tieLine.SourcePort.Key && route.OutputPort.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key;
+                        return route.OutputPort != null && route.InputPort != null && route.OutputPort?.Key == tieLine.SourcePort.Key && route.OutputPort?.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key;
                     });
 
                     if (currentRoute == null)
@@ -226,28 +228,28 @@ namespace PepperDash.Essentials.Core.Routing
                         return null;
                     }
 
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found currentRoute {currentRoute} through {midpoint}", this, currentRoute, midpoint);
+                    //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found currentRoute {currentRoute} through {midpoint}", this, currentRoute, midpoint);
 
                     nextTieLine = TieLineCollection.Default.FirstOrDefault(tl => { 
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", tl.DestinationPort.Key, currentRoute.InputPort.Key);
+                        //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", tl.DestinationPort.Key, currentRoute.InputPort.Key);
                         return tl.DestinationPort.Key == currentRoute.InputPort.Key && tl.DestinationPort.ParentDevice.Key == currentRoute.InputPort.ParentDevice.Key; });
 
                     if (nextTieLine != null)
                     {
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found next tieLine {tieLine}. Walking the chain", this, nextTieLine);
+                        //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found next tieLine {tieLine}. Walking the chain", this, nextTieLine);
                         return GetRootTieLine(nextTieLine);
                     }
 
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root tieLine {tieLine}", this,nextTieLine);
+                    //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root tieLine {tieLine}", this,nextTieLine);
                     return nextTieLine;
                 }
 
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLIne Source Device {sourceDeviceKey} is IRoutingSource: {isIRoutingSource}", this, tieLine.SourcePort.ParentDevice.Key, tieLine.SourcePort.ParentDevice is IRoutingSource);
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source Device interfaces: {typeFullName}:{interfaces}", this, tieLine.SourcePort.ParentDevice.GetType().FullName, tieLine.SourcePort.ParentDevice.GetType().GetInterfaces().Select(i => i.Name));
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLIne Source Device {sourceDeviceKey} is IRoutingSource: {isIRoutingSource}", this, tieLine.SourcePort.ParentDevice.Key, tieLine.SourcePort.ParentDevice is IRoutingSource);
+                //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source Device interfaces: {typeFullName}:{interfaces}", this, tieLine.SourcePort.ParentDevice.GetType().FullName, tieLine.SourcePort.ParentDevice.GetType().GetInterfaces().Select(i => i.Name));
 
                 if (tieLine.SourcePort.ParentDevice is IRoutingSource || tieLine.SourcePort.ParentDevice is IRoutingOutputs) //end of the chain
                 {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root: {tieLine}", this, tieLine);
+                    // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root: {tieLine}", this, tieLine);
                     return tieLine;
                 }
 

src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs

@@ -4,9 +4,6 @@ using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PepperDash.Essentials.Devices.Common.Generic
 {
@@ -16,10 +13,9 @@ namespace PepperDash.Essentials.Devices.Common.Generic
         {
             InputPorts = new RoutingPortCollection<RoutingInputPort>();
 
-            var inputPort = new RoutingInputPort($"{Key}-{RoutingPortNames.AnyVideoIn}", eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);
+            var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, null, this);            
 
             InputPorts.Add(inputPort);
-
         }
 
         public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
@@ -57,8 +53,8 @@ namespace PepperDash.Essentials.Devices.Common.Generic
 
         public override EssentialsDevice BuildDevice(DeviceConfig dc)
         {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Source Device");
-            return new GenericSource(dc.Key, dc.Name);
+            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Sink Device");
+            return new GenericSink(dc.Key, dc.Name);
         }
     }
 }

src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs

@@ -42,7 +42,7 @@ namespace PepperDash.Essentials.Devices.Common
 
         public void PrintExpectedIrCommands()
         {
-            var cmds = typeof (AppleTvIrCommands).GetType().GetFields(BindingFlags.Public | BindingFlags.Static);
+            var cmds = typeof (AppleTvIrCommands).GetFields(BindingFlags.Public | BindingFlags.Static);
 
             foreach (var value in cmds.Select(cmd => cmd.GetValue(null)).OfType<string>())
             {

src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs

@@ -1214,7 +1214,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 				var entryIndex = counterIndex;
 
 				Debug.LogMessage(LogEventLevel.Verbose, this, "Entry{2:0000} Name: {0}, Folder ID: {1}, Type: {3}, ParentFolderId: {4}",
-					entry.Name, entry.FolderId, entryIndex, entry.GetType().GetType().FullName, entry.ParentFolderId);
+					entry.Name, entry.FolderId, entryIndex, entry.GetType().FullName, entry.ParentFolderId);
 
 				if (entry is DirectoryFolder)
 				{