Adds seperate Video and Audio IO names to DmChassisControllerJoinMap

InputVideoNames = 500; //501-699
   InputAudioNames = 700; //701-899
   OutputVideoNames = 900; //901-1099
   OutputAudioNames = 1100; //1101-1299

.github/scripts/GenerateVersionNumber.ps1

@@ -1,4 +1,4 @@
-$latestVersions = $(git tag --merged origin/main)
+$latestVersions = $(git tag --merged origin/master)
 $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\/main*.' {
+  '^refs\/heads\/master*.' {
     $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 main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
+  # Defaults to master as the release branch.  Change as necessary
+  RELEASE_BRANCH: master
 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 main or release/ runs and pushes the build to the public build repo
+  # This step only runs if the branch is master 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, 'main') || contains(github.ref, '/release/')
+    if: contains(github.ref, 'master') || contains(github.ref, '/release/')
     steps:
       # Checkout the repo
       - name: check Github ref

.github/workflows/master.yml

@@ -1,11 +1,11 @@
-name: main Build using Docker
+name: Master Build using Docker
 
 on:
   release:
     types:
       - created
     branches:
-      - main
+      - master
 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 main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
+  # Defaults to master as the release branch.  Change as necessary
+  RELEASE_BRANCH: master
 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 main branch
-        run: git checkout main
+      - name: Checkout Master branch
+        run: git checkout master
       # 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 main --force
+        run: git push -u origin master --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 main or release/ runs and pushes the build to the public build repo
+  # This step only runs if the branch is master 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 main branch
+      # Checkout master branch
       - name: Create new branch
-        run: git checkout main
+        run: git checkout master
       # 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 main --force
+        run: git push -u origin master --force
       # Push the tags
       - name: Push tags
         run: git push --tags origin

PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -76,11 +76,27 @@ namespace PepperDash.Essentials.Bridges
         /// <summary>
         /// Range sets and reports the name for the corresponding input card
         /// </summary>
-        public uint InputNames { get; set; }
+        public uint InputNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding input card
+		/// </summary>
+		public uint InputVideoNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding input card
+		/// </summary>
+		public uint InputAudioNames { get; set; }
         /// <summary>
         /// Range sets and reports the name for the corresponding output card
         /// </summary>
-        public uint OutputNames { get; set; }
+        public uint OutputNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding output card
+		/// </summary>
+		public uint OutputVideoNames { get; set; }
+		/// <summary>
+		/// Range sets and reports the name for the corresponding output card
+		/// </summary>
+		public uint OutputAudioNames { get; set; }
         /// <summary>
         /// Range reports the name of the current video source for the corresponding output card
         /// </summary>
@@ -119,7 +135,11 @@ namespace PepperDash.Essentials.Bridges
 
             //Serial
             InputNames = 100; //101-299
-            OutputNames = 300; //301-499
+            OutputNames = 300; //301-499
+			InputVideoNames = 500; //501-699
+			InputAudioNames = 700; //701-899
+			OutputVideoNames = 900; //901-1099
+			OutputAudioNames = 1100; //1101-1299
             OutputCurrentVideoInputNames = 2000; //2001-2199
             OutputCurrentAudioInputNames = 2200; //2201-2399
             InputCurrentResolution = 2400; // 2401-2599
@@ -131,7 +151,11 @@ namespace PepperDash.Essentials.Bridges
 
             SystemId = SystemId + joinOffset;
             IsOnline = IsOnline + joinOffset;
-            OutputVideo = OutputVideo + joinOffset;
+            OutputVideo = OutputVideo + joinOffset;
+			InputVideoNames = InputVideoNames + joinOffset;
+			InputAudioNames = InputAudioNames + joinOffset;
+			OutputVideoNames = OutputVideoNames + joinOffset;
+			OutputAudioNames = OutputAudioNames + joinOffset; 
             OutputAudio = OutputAudio + joinOffset;
             OutputUsb = OutputUsb + joinOffset;
             InputUsb = InputUsb + joinOffset;

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

@@ -64,7 +64,7 @@
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>