update PD Core submodule commit

Update workflows for name change

.github/scripts/GenerateVersionNumber.ps1

@@ -1,4 +1,4 @@
-$latestVersions = $(git tag --merged origin/master)
+$latestVersions = $(git tag --merged origin/main)
 $latestVersion = [version]"0.0.0"
 Foreach ($version in $latestVersions) {
   Write-Host $version
@@ -18,7 +18,7 @@ $newVersion = [version]$latestVersion
 $phase = ""
 $newVersionString = ""
 switch -regex ($Env:GITHUB_REF) {
-  '^refs\/heads\/master*.' {
+  '^refs\/heads\/main*.' {
     $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, $newVersion.Build
   }
   '^refs\/heads\/feature\/*.' {

.github/workflows/docker.yml

@@ -18,8 +18,8 @@ env:
   VERSION: 0.0.0-buildtype-buildnumber
   # Defaults to debug for build type
   BUILD_TYPE: Debug
-  # Defaults to master as the release branch.  Change as necessary
-  RELEASE_BRANCH: master
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
 jobs:
   Build_Project:
     runs-on: windows-latest
@@ -189,11 +189,11 @@ jobs:
         run: git push --tags origin
       - name: Check Directory
         run: Get-ChildItem ./
-  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  # This step only runs if the branch is main or release/ runs and pushes the build to the public build repo
   Public_Push_Output:
     needs: Build_Project
     runs-on: windows-latest
-    if: contains(github.ref, 'master') || contains(github.ref, '/release/')
+    if: contains(github.ref, 'main') || contains(github.ref, '/release/')
     steps:
       # Checkout the repo
       - name: check Github ref

.github/workflows/master.yml

@@ -1,11 +1,11 @@
-name: Master Build using Docker
+name: main Build using Docker
 
 on:
   release:
     types:
       - created
     branches:
-      - master
+      - main
 env:
   # solution path doesn't need slashes unless there it is multiple folders deep
   # solution name does not include extension. .sln is assumed
@@ -15,8 +15,8 @@ env:
   VERSION: 0.0.0-buildtype-buildnumber
   # Defaults to debug for build type
   BUILD_TYPE: Release
-  # Defaults to master as the release branch.  Change as necessary
-  RELEASE_BRANCH: master
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
 jobs:
   Build_Project:
     runs-on: windows-latest
@@ -114,8 +114,8 @@ jobs:
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch
-      - name: Checkout Master branch
-        run: git checkout master
+      - name: Checkout main branch
+        run: git checkout main
       # Download the build output into the repo
       - name: Download Build output
         uses: actions/download-artifact@v1
@@ -151,13 +151,13 @@ jobs:
       # Push the commit
       - name: Push to Builds Repo
         shell: powershell
-        run: git push -u origin master --force
+        run: git push -u origin main --force
       # Push the tags
       - name: Push tags
         run: git push --tags origin
       - name: Check Directory
         run: Get-ChildItem ./
-  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  # This step only runs if the branch is main or release/ runs and pushes the build to the public build repo
   Public_Push_Output:
     needs: Build_Project
     runs-on: windows-latest
@@ -186,9 +186,9 @@ jobs:
           Write-Output "::set-env name=VERSION::$version"
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
-      # Checkout master branch
+      # Checkout main branch
       - name: Create new branch
-        run: git checkout master
+        run: git checkout main
       # Download the build output into the repo
       - name: Download Build output
         uses: actions/download-artifact@v1
@@ -224,7 +224,7 @@ jobs:
       # Push the commit
       - name: Push to Builds Repo
         shell: powershell
-        run: git push -u origin master --force
+        run: git push -u origin main --force
       # Push the tags
       - name: Push tags
         run: git push --tags origin

PepperDashEssentials/Bridges/IBridge.cs

@@ -1,5 +1,4 @@
 using System;
-using Crestron.SimplSharpPro.DeviceSupport;
 
 namespace PepperDash.Essentials.Bridges
 {
@@ -7,8 +6,7 @@ namespace PepperDash.Essentials.Bridges
     /// 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
+    public interface IBridge:Core.Bridges.IBridge
     {
-        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
     }
 }

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

@@ -110,15 +110,24 @@ namespace PepperDash.Essentials.Core.Bridges
                     if (device == null) continue;
 
                     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.
-                    //{
-                    //    Debug.Console(2, this, "'{0}' is IBridge", device.Key);
-                    //}
+
+                    if (typeof (IBridge).IsAssignableFrom(device.GetType().GetCType()))
+                    {
+                        var basicBridge = device as IBridge;
+                        if (basicBridge != null)
+                        {
+                            Debug.Console(0, this, Debug.ErrorLogLevel.Notice,
+                                "Linking EiscApiAdvanced {0} to device {1} using obsolete join map. Please update the device's join map.",
+                                Key, device.Key);
+                            basicBridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
+                        }
+                        continue;
+                    }
+
                     if (!typeof (IBridgeAdvanced).IsAssignableFrom(device.GetType().GetCType()))
                     {
                         continue;
                     }
-
                     var bridge = device as IBridgeAdvanced;
                     if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
                 }

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

@@ -1,13 +1,19 @@
 using System;
 using Crestron.SimplSharpPro.DeviceSupport;
+using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.Bridges
 {
     /// <summary>
     /// Defines a device that uses JoinMapBaseAdvanced for its join map
     /// </summary>
-    public interface IBridgeAdvanced
+    public interface IBridgeAdvanced:IKeyed
     {
         void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
     }
+
+    public interface IBridge:IKeyed
+    {
+        void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
+    }   
 }

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

@@ -313,7 +313,13 @@ namespace PepperDash.Essentials.Core
 
             var deviceKey = args[0];
             var setting = args[1];
-            var timeout = args[2];
+
+            var timeout= String.Empty;
+
+            if (args.Length >= 3)
+            {
+                timeout = args[2];
+            }
 
             var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
 
@@ -322,42 +328,38 @@ namespace PepperDash.Essentials.Core
                 Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
                 return;
             }
-            else
-            {
-                eStreamDebuggingSetting debugSetting = eStreamDebuggingSetting.Off;
 
+            eStreamDebuggingSetting debugSetting;
+
+            try
+            {
+                debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
+            }
+            catch
+            {
+                Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
+                return;
+            }
+
+            if (!string.IsNullOrEmpty(timeout))
+            {
                 try
                 {
-                    debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
-                }
-                catch
-                {
-                    Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
-                    return;
-                }
+                    var min = Convert.ToUInt32(timeout);
 
-                if (!string.IsNullOrEmpty(timeout))
-                {
-                    try
-                    {
-                        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);
 
-                        device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                        Debug.Console(0, "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);
-                        return;
-                    }
                 }
-                else
+                catch (Exception e)
                 {
-                    device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
+                    Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes. Errro: {0}", e);
                 }
-                
+            }
+            else
+            {
+                device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
+                Debug.Console(0, "Device: '{0}' debug level set to {1) for default time (30 minutes)", deviceKey, debugSetting);
             }
         }
 

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k100Controller.cs

@@ -68,8 +68,9 @@ namespace PepperDash.Essentials.DM
 
             // Set Ports for CEC
             HdmiIn.Port = Tx;
-        }
 
+            PreventRegistration = true;
+        }
 
         public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {