Merge pull request #110 from PepperDash/hotfix/fix-dm-project-name

Updates the project name from Essentials_DM to PepperDash_Essentials_…

.github/scripts/GenerateVersionNumber.ps1

@@ -39,10 +39,6 @@ switch -regex ($Env:GITHUB_REF) {
     $phase = 'hotfix'
     $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
   }
-  '^refs\/heads\/bugfix\/*.' {
-    $phase = 'hotfix'
-    $newVersionString = "{0}.{1}.{2}-{3}-{4}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1), $phase, $Env:GITHUB_RUN_NUMBER
-  }
 }
 
 

.github/scripts/ZipBuildOutput.ps1

@@ -26,7 +26,7 @@ Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz
 } | Copy-Item -Destination ($destination) -Force
 Write-Host "Getting matching files..."
 # Get any files from the output folder that match the following extensions
-Get-ChildItem -Path $destination | Where-Object { ($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz")) } | ForEach-Object { 
+Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { 
   # Replace the extensions with dll and xml and create an array 
   $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
   Write-Host "Filenames:"
@@ -36,8 +36,6 @@ Get-ChildItem -Path $destination | Where-Object { ($_.Extension -eq ".clz") -or
     Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
   }
 }
-
-Get-ChildItem -Path $destination\*.cpz | Rename-Item -NewName { "$($_.BaseName)-$($Env:VERSION)$($_.Extension)" }
 Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
 Write-Host "Output Contents post Zip"
 Get-ChildItem -Path $destination

.github/workflows/docker.yml

@@ -5,13 +5,12 @@ on:
     branches:
       - feature/*
       - hotfix/*
-      - bugfix/*
       - release/*
       - development
 
 env:
   # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
+  # solution name does not include extension. .sln is assumed  
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials
   # Do not edit this, we're just creating it here
@@ -79,8 +78,7 @@ jobs:
       # Create the release on the source repo
       - name: Create Release
         id: create_release
-        # using contributor's version to allow for pointing at the right commit
-        uses: fleskesvor/create-release@feature/support-target-commitish
+        uses: actions/create-release@v1
         with:
           tag_name: ${{ env.VERSION  }}
           release_name: ${{ env.VERSION }}
@@ -145,12 +143,6 @@ jobs:
           Remove-Item -Path .\*.zip
       - name: Check directory again
         run: Get-ChildItem ./
-      # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
       # Commits the build output to the branch and tags it with the version
       - name: Commit build output and tag the commit
         shell: powershell
@@ -222,12 +214,6 @@ jobs:
           Remove-Item -Path .\*.zip
       - name: Check directory again
         run: Get-ChildItem ./
-        # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
       # Commits the build output to the branch and tags it with the version
       - name: Commit build output and tag the commit
         shell: powershell

.github/workflows/master.yml

@@ -56,11 +56,21 @@ jobs:
       - name: Zip Build Output
         shell: powershell
         run: ./.github/scripts/ZipBuildOutput.ps1
+        # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
+      # Upload the build output as an artifact
       - name: Upload Build Output
         uses: actions/upload-artifact@v1
         with:
           name: Build
           path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
       # Upload the build package to the release
       - name: Upload Release Package
         id: upload_release
@@ -72,7 +82,6 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # This step always runs and pushes the build to the internal build rep
   Internal_Push_Output:
     needs: Build_Project
     runs-on: windows-latest
@@ -102,85 +111,8 @@ jobs:
           Remove-Item -Path ./Version/version.txt
           Remove-Item -Path ./Version
       # Checkout/Create the branch
-      - name: Create new branch
-        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
-      # Download the build output into the repo
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Check directory
-        run: Get-ChildItem ./
-      # Unzip the build package file
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - name: Check directory again
-        run: Get-ChildItem ./
-      # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
-      # Commits the build output to the branch and tags it with the version
-      - name: Commit build output and tag the commit
-        shell: powershell
-        run: |
-          git config user.email "actions@pepperdash.com"
-          git config user.name "GitHub Actions"
-          git add .
-          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
-          Write-Host "Commit: $commit"
-          git commit -m $commit
-          git tag $($Env:VERSION)
-      # Push the commit
-      - name: Push to Builds Repo
-        shell: powershell
-        run: |
-          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
-          Write-Host "Branch: $branch"
-          git push -u origin $($branch) --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
-  Public_Push_Output:
-    needs: Build_Project
-    runs-on: windows-latest
-    if: contains(github.ref, 'master') || contains(github.ref, 'release')
-    steps:
-      # Checkout the repo
-      - name: Checkout Builds Repo
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.BUILDS_TOKEN }}
-          repository: PepperDash/Essentials-Builds
-          ref: ${{ Env.GITHUB_REF }}
-      # Download the version artifact from the build job
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Check Directory
-        run: Get-ChildItem "./"
-      # Set the version number environment variable from the file we just downloaded
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          Write-Output "::set-env name=VERSION::$version"
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      # Checkout/Create the branch
-      - name: Create new branch
-        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      - name: Checkout Master branch
+        run: git checkout master
       # Download the build output into the repo
       - name: Download Build output
         uses: actions/download-artifact@v1
@@ -216,10 +148,80 @@ jobs:
       # Push the commit
       - name: Push to Builds Repo
         shell: powershell
-        run: |
-          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
-          Write-Host "Branch: $branch"
-          git push -u origin $($branch) --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 master or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout master branch
+      - name: Create new branch
+        run: git checkout master
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: git push -u origin master --force
       # Push the tags
       - name: Push tags
         run: git push --tags origin

PepperDashEssentials/AppServer/Messengers/CameraBaseMessenger.cs

@@ -1,174 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class CameraBaseMessenger : MessengerBase
-    {
-        /// <summary>
-        /// Device being bridged
-        /// </summary>
-        public CameraBase Camera { get; set; }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="camera"></param>
-        /// <param name="messagePath"></param>
-        public CameraBaseMessenger(string key, CameraBase camera, string messagePath)
-            : base(key, messagePath)
-        {
-            if (camera == null)
-                throw new ArgumentNullException("camera");
-
-            Camera = camera;
-
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            if (presetsCamera != null)
-            {
-                presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>(presetsCamera_PresetsListHasChanged);
-            }
- 
-        }
-
-        void presetsCamera_PresetsListHasChanged(object sender, EventArgs e)
-        {
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            var presetList = new List<CameraPreset>();
-
-            if (presetsCamera != null)
-                presetList = presetsCamera.Presets;
-
-            PostStatusMessage(new
-            {
-                presets = presetList
-            });
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendCameraFullMessageObject));
-
-            var ptzCamera = Camera as IHasCameraPtzControl;
-
-            if (ptzCamera != null)
-            {
-                
-                //  Need to evaluate how to pass through these P&H actions.  Need a method that takes a bool maybe?
-                AppServerController.AddAction(MessagePath + "/cameraUp", new PressAndHoldAction((b) =>
-                    {
-                        if (b)
-                            ptzCamera.TiltUp();
-                        else
-                            ptzCamera.TiltStop();
-                    }));
-                AppServerController.AddAction(MessagePath + "/cameraDown", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.TiltDown();
-                    else
-                        ptzCamera.TiltStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraLeft", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.PanLeft();
-                    else
-                        ptzCamera.PanStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraRight", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.PanRight();
-                    else
-                        ptzCamera.PanStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraZoomIn", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.ZoomIn();
-                    else
-                        ptzCamera.ZoomStop();
-                }));
-                AppServerController.AddAction(MessagePath + "/cameraZoomOut", new PressAndHoldAction((b) =>
-                {
-                    if (b)
-                        ptzCamera.ZoomOut();
-                    else
-                        ptzCamera.ZoomStop();
-                }));
-            }
-
-            if (Camera is IHasCameraAutoMode)
-            {
-                appServerController.AddAction(MessagePath + "/cameraModeAuto", new Action((Camera as IHasCameraAutoMode).CameraAutoModeOn));
-                appServerController.AddAction(MessagePath + "/cameraModeManual", new Action((Camera as IHasCameraAutoMode).CameraAutoModeOff));
-            }
-
-            if (Camera is IPower)
-            {
-                appServerController.AddAction(MessagePath + "/cameraModeOff", new Action((Camera as IPower).PowerOff));
-            }
-
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            if (presetsCamera != null)
-            {
-                for(int i = 1; i <= 6; i++)
-                {
-                    var preset = i;
-                    appServerController.AddAction(MessagePath + "/cameraPreset" + i, new Action<int>((p) => presetsCamera.PresetSelect(preset)));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Helper method to update the full status of the camera
-        /// </summary>
-        void SendCameraFullMessageObject()
-        {
-            var presetsCamera = Camera as IHasCameraPresets;
-
-            var presetList = new List<CameraPreset>();
-
-            if (presetsCamera != null)
-                presetList = presetsCamera.Presets;
-
-            PostStatusMessage(new
-            {
-                cameraMode = GetCameraMode(),
-                hasPresets = Camera is IHasCameraPresets,
-                presets = presetList
-            });
-        }
-
-        /// <summary>
-        /// Computes the current camera mode
-        /// </summary>
-        /// <returns></returns>
-        string GetCameraMode()
-        {
-            string m;
-            if (Camera is IHasCameraAutoMode && (Camera as IHasCameraAutoMode).CameraAutoModeIsOnFeedback.BoolValue)
-                m = eCameraControlMode.Auto.ToString().ToLower();
-            else if (Camera is IPower && !(Camera as IPower).PowerIsOnFeedback.BoolValue)
-                m = eCameraControlMode.Off.ToString().ToLower();
-            else
-                m = eCameraControlMode.Manual.ToString().ToLower();
-            return m;
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/Ddvc01AtcMessenger.cs

@@ -0,0 +1,216 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.EthernetCommunication;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common.Codec;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+	public class Ddvc01AtcMessenger : MessengerBase
+	{
+		BasicTriList EISC;
+
+		/// <summary>
+		/// 221
+		/// </summary>
+		const uint BDialHangupOnHook = 221;
+
+		/// <summary>
+		/// 251
+		/// </summary>
+		const uint BIncomingAnswer = 251;
+		/// <summary>
+		/// 252
+		/// </summary>
+		const uint BIncomingReject = 252;
+		/// <summary>
+		/// 241
+		/// </summary>
+		const uint BSpeedDial1 = 241;
+		/// <summary>
+		/// 242
+		/// </summary>
+		const uint BSpeedDial2 = 242;
+		/// <summary>
+		/// 243
+		/// </summary>
+		const uint BSpeedDial3 = 243;
+		/// <summary>
+		/// 244
+		/// </summary>
+		const uint BSpeedDial4 = 244;
+
+		/// <summary>
+		/// 201
+		/// </summary>
+		const uint SCurrentDialString = 201;
+		/// <summary>
+		/// 211
+		/// </summary>
+		const uint SCurrentCallNumber = 211;
+        /// <summary>
+        /// 212
+        /// </summary>
+        const uint SCurrentCallName = 212;
+		/// <summary>
+		/// 221
+		/// </summary>
+		const uint SHookState = 221;
+        /// <summary>
+        /// 222
+        /// </summary>
+        const uint SCallDirection = 222;
+
+		/// <summary>
+		/// 201-212 0-9*#
+		/// </summary>
+		Dictionary<string, uint> DTMFMap = new Dictionary<string, uint>
+		{
+			{ "1", 201 },
+			{ "2", 202 },
+			{ "3", 203 },
+			{ "4", 204 },
+			{ "5", 205 },
+			{ "6", 206 },
+			{ "7", 207 },
+			{ "8", 208 },
+			{ "9", 209 },
+			{ "0", 210 },
+			{ "*", 211 },
+			{ "#", 212 },
+		};
+
+		/// <summary>
+		/// 
+		/// </summary>
+		CodecActiveCallItem CurrentCallItem;
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="eisc"></param>
+		/// <param name="messagePath"></param>
+		public Ddvc01AtcMessenger(string key, BasicTriList eisc, string messagePath)
+			: base(key, messagePath)
+		{
+			EISC = eisc;
+
+			CurrentCallItem = new CodecActiveCallItem();
+			CurrentCallItem.Type = eCodecCallType.Audio;
+			CurrentCallItem.Id = "-audio-";
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		void SendFullStatus()
+		{
+            
+
+			this.PostStatusMessage(new
+			{				
+				calls = GetCurrentCallList(),
+				currentCallString = EISC.GetString(SCurrentCallNumber),
+				currentDialString = EISC.GetString(SCurrentDialString),
+                isInCall = EISC.GetString(SHookState) == "Connected"
+			});
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appServerController"></param>
+		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+		{
+            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
+
+			EISC.SetStringSigAction(SHookState, s => 
+			{
+				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
+                //GetCurrentCallList();
+				SendFullStatus();
+			});
+
+			EISC.SetStringSigAction(SCurrentCallNumber, s => 
+			{
+				CurrentCallItem.Number = s;
+                SendCallsList();
+			});
+
+            EISC.SetStringSigAction(SCurrentCallName, s =>
+            {
+                CurrentCallItem.Name = s;
+                SendCallsList();
+            });
+
+            EISC.SetStringSigAction(SCallDirection, s =>
+            {
+                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
+                SendCallsList();
+            });
+
+			// Add press and holds using helper
+			Action<string, uint> addPHAction = (s, u) => 
+				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
+
+			// Add straight pulse calls
+			Action<string, uint> addAction = (s, u) =>
+				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
+            addAction("/endCallById", BDialHangupOnHook);
+			addAction("/endAllCalls", BDialHangupOnHook);
+            addAction("/acceptById", BIncomingAnswer);
+            addAction("/rejectById", BIncomingReject);
+			addAction("/speedDial1", BSpeedDial1);
+			addAction("/speedDial2", BSpeedDial2);
+			addAction("/speedDial3", BSpeedDial3);
+			addAction("/speedDial4", BSpeedDial4);
+
+			// Get status
+			AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatus));
+			// Dial on string
+			AppServerController.AddAction(MessagePath + "/dial", new Action<string>(s => EISC.SetString(SCurrentDialString, s)));
+			// Pulse DTMF
+			AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
+			{
+				if (DTMFMap.ContainsKey(s))
+				{
+					EISC.PulseBool(DTMFMap[s], 100);
+				}
+			}));
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+        void SendCallsList()
+        {
+            PostStatusMessage(new
+            {
+                calls = GetCurrentCallList(),
+            });
+        }
+
+		/// <summary>
+		/// Turns the 
+		/// </summary>
+		/// <returns></returns>
+		List<CodecActiveCallItem> GetCurrentCallList()
+		{
+			if (CurrentCallItem.Status == eCodecCallStatus.Disconnected)
+			{
+				return new List<CodecActiveCallItem>();
+			}
+			else
+			{
+				return new List<CodecActiveCallItem>() { CurrentCallItem };
+			}
+		}
+	}
+}

PepperDashEssentials/AppServer/Messengers/Ddvc01VtcMessenger.cs

@@ -0,0 +1,648 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.EthernetCommunication;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Devices.Common.Codec;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+	public class Ddvc01VtcMessenger : MessengerBase
+	{
+		BasicTriList EISC;
+
+		/********* Bools *********/
+		/// <summary>
+		/// 724
+		/// </summary>
+		const uint BDialHangup = 724;
+		/// <summary>
+		/// 750
+		/// </summary>
+		const uint BCallIncoming = 750;
+		/// <summary>
+		/// 751
+		/// </summary>
+		const uint BIncomingAnswer = 751;
+		/// <summary>
+		/// 752
+		/// </summary>
+		const uint BIncomingReject = 752;
+		/// <summary>
+		/// 741
+		/// </summary>
+		const uint BSpeedDial1 = 741;
+		/// <summary>
+		/// 742
+		/// </summary>
+		const uint BSpeedDial2 = 742;
+		/// <summary>
+		/// 743
+		/// </summary>
+		const uint BSpeedDial3 = 743;
+		/// <summary>
+		/// 744
+		/// </summary>
+		const uint BSpeedDial4 = 744;
+		/// <summary>
+		/// 800
+		/// </summary>
+		const uint BDirectorySearchBusy = 800;
+		/// <summary>
+		/// 801 
+		/// </summary>
+		const uint BDirectoryLineSelected = 801;
+		/// <summary>
+		/// 801 when selected entry is a contact
+		/// </summary>
+		const uint BDirectoryEntryIsContact = 801;
+		/// <summary>
+		/// 802 To show/hide back button
+		/// </summary>
+		const uint BDirectoryIsRoot = 802;
+		/// <summary>
+		/// 803 Pulse from system to inform us when directory is ready
+		/// </summary>
+		const uint DDirectoryHasChanged = 803;
+		/// <summary>
+		/// 804
+		/// </summary>
+		const uint BDirectoryRoot = 804;
+		/// <summary>
+		/// 805
+		/// </summary>
+		const uint BDirectoryFolderBack = 805;
+		/// <summary>
+		/// 806
+		/// </summary>
+		const uint BDirectoryDialSelectedLine = 806;
+		/// <summary>
+		/// 811
+		/// </summary>
+		const uint BCameraControlUp = 811;
+		/// <summary>
+		/// 812
+		/// </summary>
+		const uint BCameraControlDown = 812;
+		/// <summary>
+		/// 813
+		/// </summary>
+		const uint BCameraControlLeft = 813;
+		/// <summary>
+		/// 814
+		/// </summary>
+		const uint BCameraControlRight = 814;
+		/// <summary>
+		/// 815
+		/// </summary>
+		const uint BCameraControlZoomIn = 815;
+		/// <summary>
+		/// 816
+		/// </summary>
+		const uint BCameraControlZoomOut = 816;
+		/// <summary>
+		/// 821 - 826
+		/// </summary>
+		const uint BCameraPresetStart = 821;
+
+		/// <summary>
+		/// 831
+		/// </summary>
+		const uint BCameraModeAuto = 831;
+		/// <summary>
+		/// 832
+		/// </summary>
+		const uint BCameraModeManual = 832;
+		/// <summary>
+		/// 833
+		/// </summary>
+		const uint BCameraModeOff = 833;
+
+		/// <summary>
+		/// 841
+		/// </summary>
+		const uint BCameraSelfView = 841;
+
+		/// <summary>
+		/// 842
+		/// </summary>
+		const uint BCameraLayout = 842;
+		/// <summary>
+		/// 843
+		/// </summary>
+		const uint BCameraSupportsAutoMode = 843;
+		/// <summary>
+		/// 844
+		/// </summary>
+		const uint BCameraSupportsOffMode = 844;
+
+
+		/********* Ushorts *********/
+		/// <summary>
+		/// 760
+		/// </summary>
+		const uint UCameraNumberSelect = 760;
+		/// <summary>
+		/// 801
+		/// </summary>
+		const uint UDirectorySelectRow = 801;
+		/// <summary>
+		/// 801
+		/// </summary>
+		const uint UDirectoryRowCount = 801;
+
+
+
+		/********* Strings *********/
+		/// <summary>
+		/// 701
+		/// </summary>
+		const uint SCurrentDialString = 701;
+		/// <summary>
+		/// 702
+		/// </summary>
+		const uint SCurrentCallName = 702;
+        /// <summary>
+		/// 703
+        /// </summary>
+		const uint SCurrentCallNumber = 703;
+		/// <summary>
+		/// 731
+		/// </summary>
+		const uint SHookState = 731;
+        /// <summary>
+		/// 722
+        /// </summary>
+        const uint SCallDirection = 722;
+		/// <summary>
+		/// 751
+		/// </summary>
+		const uint SIncomingCallName = 751;
+		/// <summary>
+		/// 752
+		/// </summary>
+		const uint SIncomingCallNumber = 752;
+
+		/// <summary>
+		/// 800
+		/// </summary>
+		const uint SDirectorySearchString = 800;
+		/// <summary>
+		/// 801-1055
+		/// </summary>
+		const uint SDirectoryEntriesStart = 801;
+		/// <summary>
+		/// 1056
+		/// </summary>
+		const uint SDirectoryEntrySelectedName = 1056;
+		/// <summary>
+		/// 1057
+		/// </summary>
+		const uint SDirectoryEntrySelectedNumber = 1057;
+		/// <summary>
+		/// 1058
+		/// </summary>
+		const uint SDirectorySelectedFolderName = 1058;
+
+
+		/// <summary>
+		/// 701-712 0-9*#
+		/// </summary>
+		Dictionary<string, uint> DTMFMap = new Dictionary<string, uint>
+		{
+			{ "1", 701 },
+			{ "2", 702 },
+			{ "3", 703 },
+			{ "4", 704 },
+			{ "5", 705 },
+			{ "6", 706 },
+			{ "7", 707 },
+			{ "8", 708 },
+			{ "9", 709 },
+			{ "0", 710 },
+			{ "*", 711 },
+			{ "#", 712 },
+		};
+
+		CodecActiveCallItem CurrentCallItem;
+		CodecActiveCallItem IncomingCallItem;
+
+		ushort PreviousDirectoryLength = 0;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="eisc"></param>
+		/// <param name="messagePath"></param>
+		public Ddvc01VtcMessenger(string key, BasicTriList eisc, string messagePath)
+			: base(key, messagePath)
+		{
+			EISC = eisc;
+
+			CurrentCallItem = new CodecActiveCallItem();
+			CurrentCallItem.Type = eCodecCallType.Video;
+			CurrentCallItem.Id = "-video-";
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="appServerController"></param>
+		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+		{
+			var asc = appServerController;
+			EISC.SetStringSigAction(SHookState, s => 
+			{
+				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
+				PostFullStatus(); // SendCallsList();
+			});
+
+			EISC.SetStringSigAction(SCurrentCallNumber, s => 
+			{
+				CurrentCallItem.Number = s;
+                PostCallsList();
+			});
+
+            EISC.SetStringSigAction(SCurrentCallName, s =>
+            {
+                CurrentCallItem.Name = s;
+                PostCallsList();
+            });
+
+            EISC.SetStringSigAction(SCallDirection, s =>
+            {
+                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
+                PostCallsList();
+            });
+
+			EISC.SetBoolSigAction(BCallIncoming, b =>
+			{
+				if (b)
+				{
+					var ica = new CodecActiveCallItem()
+					{
+						Direction = eCodecCallDirection.Incoming,
+						Id = "-video-incoming",
+						Name = EISC.GetString(SIncomingCallName),
+						Number = EISC.GetString(SIncomingCallNumber),
+						Status = eCodecCallStatus.Ringing,
+						Type = eCodecCallType.Video
+					};
+					IncomingCallItem = ica;
+				}
+				else
+				{
+					IncomingCallItem = null;
+				}
+				PostCallsList();
+			});
+
+			EISC.SetBoolSigAction(BCameraSupportsAutoMode, b =>
+			{
+				PostStatusMessage(new
+				{	
+					cameraSupportsAutoMode = b
+				});
+			});
+			EISC.SetBoolSigAction(BCameraSupportsOffMode, b =>
+			{
+				PostStatusMessage(new
+				{
+					cameraSupportsOffMode = b
+				});
+			});
+
+			// Directory insanity
+			EISC.SetUShortSigAction(UDirectoryRowCount, u =>
+			{
+				// The length of the list comes in before the list does.
+				// Splice the sig change operation onto the last string sig that will be changing
+				// when the directory entries make it through.
+				if (PreviousDirectoryLength > 0)
+				{
+					EISC.ClearStringSigAction(SDirectoryEntriesStart + PreviousDirectoryLength - 1);
+				}
+				EISC.SetStringSigAction(SDirectoryEntriesStart + u - 1, s => PostDirectory());
+				PreviousDirectoryLength = u;
+			});
+
+			EISC.SetStringSigAction(SDirectoryEntrySelectedName, s =>
+			{
+				PostStatusMessage(new
+				{
+					directoryContactSelected = new
+					{
+						name = EISC.GetString(SDirectoryEntrySelectedName),
+					}
+				});
+			});
+
+			EISC.SetStringSigAction(SDirectoryEntrySelectedNumber, s =>
+			{
+				PostStatusMessage(new
+				{
+					directoryContactSelected = new
+					{
+						number = EISC.GetString(SDirectoryEntrySelectedNumber),
+					}
+				});
+			});
+
+			EISC.SetStringSigAction(SDirectorySelectedFolderName, s => PostStatusMessage(new
+			{
+				directorySelectedFolderName = EISC.GetString(SDirectorySelectedFolderName)
+			}));
+
+			EISC.SetSigTrueAction(BCameraModeAuto, () => PostCameraMode());
+			EISC.SetSigTrueAction(BCameraModeManual, () => PostCameraMode());
+			EISC.SetSigTrueAction(BCameraModeOff, () => PostCameraMode());
+
+			EISC.SetBoolSigAction(BCameraSelfView, b => PostStatusMessage(new 
+				{
+					cameraSelfView = b
+				}));
+
+			EISC.SetUShortSigAction(UCameraNumberSelect, (u) => PostSelectedCamera());
+
+
+			// Add press and holds using helper action
+			Action<string, uint> addPHAction = (s, u) => 
+				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
+			addPHAction("/cameraUp", BCameraControlUp);
+			addPHAction("/cameraDown", BCameraControlDown);
+			addPHAction("/cameraLeft", BCameraControlLeft);
+			addPHAction("/cameraRight", BCameraControlRight);
+			addPHAction("/cameraZoomIn", BCameraControlZoomIn);
+			addPHAction("/cameraZoomOut", BCameraControlZoomOut);
+
+			// Add straight pulse calls using helper action
+			Action<string, uint> addAction = (s, u) =>
+				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
+			addAction("/endCallById", BDialHangup);
+			addAction("/endAllCalls", BDialHangup);
+            addAction("/acceptById", BIncomingAnswer);
+            addAction("/rejectById", BIncomingReject);
+			addAction("/speedDial1", BSpeedDial1);
+			addAction("/speedDial2", BSpeedDial2);
+			addAction("/speedDial3", BSpeedDial3);
+			addAction("/speedDial4", BSpeedDial4);
+			addAction("/cameraModeAuto", BCameraModeAuto);
+			addAction("/cameraModeManual", BCameraModeManual);
+			addAction("/cameraModeOff", BCameraModeOff);
+			addAction("/cameraSelfView", BCameraSelfView);
+			addAction("/cameraLayout", BCameraLayout);
+
+			asc.AddAction("/cameraSelect", new Action<string>(SelectCamera));
+
+			// camera presets
+			for(uint i = 0; i < 6; i++) 
+			{
+				addAction("/cameraPreset" + (i + 1), BCameraPresetStart + i);
+			}
+
+			asc.AddAction(MessagePath + "/isReady", new Action(PostIsReady));
+			// Get status
+			asc.AddAction(MessagePath + "/fullStatus", new Action(PostFullStatus));
+			// Dial on string
+			asc.AddAction(MessagePath + "/dial", new Action<string>(s => 
+				EISC.SetString(SCurrentDialString, s)));
+			// Pulse DTMF
+			asc.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
+			{
+				if (DTMFMap.ContainsKey(s))
+				{
+					EISC.PulseBool(DTMFMap[s], 100);
+				}
+			}));
+
+			// Directory madness
+			asc.AddAction(MessagePath + "/directoryRoot", new Action(() => EISC.PulseBool(BDirectoryRoot)));
+			asc.AddAction(MessagePath + "/directoryBack", new Action(() => EISC.PulseBool(BDirectoryFolderBack)));
+			asc.AddAction(MessagePath + "/directoryById", new Action<string>(s =>
+			{
+				// the id should contain the line number to forward to simpl
+				try
+				{
+					var u = ushort.Parse(s);
+					EISC.SetUshort(UDirectorySelectRow, u);
+					EISC.PulseBool(BDirectoryLineSelected);
+				}
+				catch (Exception)
+				{
+					Debug.Console(1, this, Debug.ErrorLogLevel.Warning, 
+						"/directoryById request contains non-numeric ID incompatible with DDVC bridge");
+				}
+
+			}));
+			asc.AddAction(MessagePath + "/directorySelectContact", new Action<string>(s =>
+			{
+				try
+				{
+					var u = ushort.Parse(s);
+					EISC.SetUshort(UDirectorySelectRow, u);
+					EISC.PulseBool(BDirectoryLineSelected);
+				}
+				catch
+				{
+					
+				}
+			}));
+			asc.AddAction(MessagePath + "/directoryDialContact", new Action(() => {
+				EISC.PulseBool(BDirectoryDialSelectedLine);
+			}));
+			asc.AddAction(MessagePath + "/getDirectory", new Action(() =>
+			{
+				if (EISC.GetUshort(UDirectoryRowCount) > 0)
+				{
+					PostDirectory();
+				}
+				else
+				{
+					EISC.PulseBool(BDirectoryRoot);
+				}
+			}));
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		void PostFullStatus()
+		{
+			this.PostStatusMessage(new
+			{
+				calls = GetCurrentCallList(),
+				cameraMode = GetCameraMode(),
+				cameraSelfView = EISC.GetBool(BCameraSelfView),
+				cameraSupportsAutoMode = EISC.GetBool(BCameraSupportsAutoMode),
+				cameraSupportsOffMode = EISC.GetBool(BCameraSupportsOffMode),
+				currentCallString = EISC.GetString(SCurrentCallNumber),
+				currentDialString = EISC.GetString(SCurrentDialString),
+				directoryContactSelected = new
+				{
+					name = EISC.GetString(SDirectoryEntrySelectedName),
+					number = EISC.GetString(SDirectoryEntrySelectedNumber)
+				},
+				directorySelectedFolderName = EISC.GetString(SDirectorySelectedFolderName),
+				isInCall = EISC.GetString(SHookState) == "Connected",
+				hasDirectory = true,
+				hasDirectorySearch = false,
+				hasRecents = !EISC.BooleanOutput[502].BoolValue,
+				hasCameras = true,
+				showCamerasWhenNotInCall = EISC.BooleanOutput[503].BoolValue,
+				selectedCamera = GetSelectedCamera(),
+			});
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		void PostDirectory()
+		{
+			var u = EISC.GetUshort(UDirectoryRowCount);
+			var items = new List<object>();
+			for (uint i = 0; i < u; i++)
+			{
+				var name = EISC.GetString(SDirectoryEntriesStart + i);
+				var id = (i + 1).ToString();
+				// is folder or contact?
+				if (name.StartsWith("[+]"))
+				{
+					items.Add(new
+					{
+						folderId = id,
+						name = name
+					});
+				}
+				else
+				{
+					items.Add(new
+					{
+						contactId = id,
+						name = name
+					});
+				}
+			}
+
+			var directoryMessage = new
+			{
+				currentDirectory = new
+				{
+					isRootDirectory = EISC.GetBool(BDirectoryIsRoot),
+					directoryResults = items
+				}
+			};
+			PostStatusMessage(directoryMessage);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		void PostCameraMode()
+		{
+			PostStatusMessage(new
+			{
+				cameraMode = GetCameraMode()
+			});
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="mode"></param>
+		string GetCameraMode()
+		{
+			string m;
+			if (EISC.GetBool(BCameraModeAuto)) m = "auto";
+			else if (EISC.GetBool(BCameraModeManual)) m = "manual";
+			else m = "off";
+			return m;
+		}
+
+		void PostSelectedCamera()
+		{
+			PostStatusMessage(new
+			{
+				selectedCamera = GetSelectedCamera()
+			});
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		string GetSelectedCamera()
+		{
+			var num = EISC.GetUshort(UCameraNumberSelect);
+			string m;
+			if (num == 100)
+			{
+				m = "cameraFar";
+			}
+			else
+			{
+				m = "camera" + num;
+			}
+			return m;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		void PostIsReady()
+		{
+			PostStatusMessage(new
+			{
+				isReady = true
+			});
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+        void PostCallsList()
+        {
+            PostStatusMessage(new
+            {
+                calls = GetCurrentCallList(),
+            });
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="s"></param>
+		void SelectCamera(string s)
+		{
+			var cam = s.Substring(6);
+			if (cam.ToLower() == "far")
+			{
+				EISC.SetUshort(UCameraNumberSelect, 100);
+			}
+			else
+			{
+				EISC.SetUshort(UCameraNumberSelect, UInt16.Parse(cam));
+			}
+		}
+
+		/// <summary>
+		/// Turns the 
+		/// </summary>
+		/// <returns></returns>
+		List<CodecActiveCallItem> GetCurrentCallList()
+		{
+			var list = new List<CodecActiveCallItem>();
+			if (CurrentCallItem.Status != eCodecCallStatus.Disconnected)
+			{
+				list.Add(CurrentCallItem);
+			}
+			if (EISC.GetBool(BCallIncoming)) {
+
+			}
+			return list;
+		}
+	}
+}

PepperDashEssentials/AppServer/Messengers/IRunRouteActionMessenger.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class IRunRouteActionMessenger : MessengerBase
-    {
-        /// <summary>
-        /// Device being bridged
-        /// </summary>
-        public IRunRouteAction RoutingDevice {get; private set;}
-
-        public IRunRouteActionMessenger(string key, IRunRouteAction routingDevice, string messagePath)
-            : base(key, messagePath)
-        {
-            if (routingDevice == null)
-                throw new ArgumentNullException("routingDevice");
-
-            RoutingDevice = routingDevice;
-
-            var routingSink = RoutingDevice as IRoutingSinkNoSwitching;
-
-            if (routingSink != null)
-            {
-                routingSink.CurrentSourceChange += new SourceInfoChangeHandler(routingSink_CurrentSourceChange);
-            }
-        }
-
-        void routingSink_CurrentSourceChange(SourceListItem info, ChangeType type)
-        {
-            SendRoutingFullMessageObject();
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendRoutingFullMessageObject));
-
-            appServerController.AddAction(MessagePath + "/source", new Action<SourceSelectMessageContent>(c =>
-                    {
-                        RoutingDevice.RunRouteAction(c.SourceListItem, c.SourceListKey);
-                    }));
-
-            var sinkDevice = RoutingDevice as IRoutingSinkNoSwitching;
-            if(sinkDevice != null)
-            {
-                sinkDevice.CurrentSourceChange += new SourceInfoChangeHandler((o, a) =>
-                {
-                    SendRoutingFullMessageObject();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Helper method to update full status of the routing device
-        /// </summary>
-        void SendRoutingFullMessageObject()
-        {
-            var sinkDevice = RoutingDevice as IRoutingSinkNoSwitching;
-
-            if(sinkDevice != null) 
-            {
-                var sourceKey = sinkDevice.CurrentSourceInfoKey;
-
-                if (string.IsNullOrEmpty(sourceKey))
-                    sourceKey = "none";
-
-                PostStatusMessage(new
-                {
-                    selectedSourceKey = sourceKey
-                });
-            }
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/SIMPLAtcMessenger.cs

@@ -1,230 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Codec;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	public class SIMPLAtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-        public SIMPLAtcJoinMap JoinMap {get; private set;}
-
-        ///// <summary>
-        ///// 221
-        ///// </summary>
-        //const uint BDialHangupOnHook = 221;
-
-        ///// <summary>
-        ///// 251
-        ///// </summary>
-        //const uint BIncomingAnswer = 251;
-        ///// <summary>
-        ///// 252
-        ///// </summary>
-        //const uint BIncomingReject = 252;
-        ///// <summary>
-        ///// 241
-        ///// </summary>
-        //const uint BSpeedDial1 = 241;
-        ///// <summary>
-        ///// 242
-        ///// </summary>
-        //const uint BSpeedDial2 = 242;
-        ///// <summary>
-        ///// 243
-        ///// </summary>
-        //const uint BSpeedDial3 = 243;
-        ///// <summary>
-        ///// 244
-        ///// </summary>
-        //const uint BSpeedDial4 = 244;
-
-        ///// <summary>
-        ///// 201
-        ///// </summary>
-        //const uint SCurrentDialString = 201;
-        ///// <summary>
-        ///// 211
-        ///// </summary>
-        //const uint SCurrentCallNumber = 211;
-        ///// <summary>
-        ///// 212
-        ///// </summary>
-        //const uint SCurrentCallName = 212;
-        ///// <summary>
-        ///// 221
-        ///// </summary>
-        //const uint SHookState = 221;
-        ///// <summary>
-        ///// 222
-        ///// </summary>
-        //const uint SCallDirection = 222;
-
-        ///// <summary>
-        ///// 201-212 0-9*#
-        ///// </summary>
-        //Dictionary<string, uint> DTMFMap = new Dictionary<string, uint>
-        //{
-        //    { "1", 201 },
-        //    { "2", 202 },
-        //    { "3", 203 },
-        //    { "4", 204 },
-        //    { "5", 205 },
-        //    { "6", 206 },
-        //    { "7", 207 },
-        //    { "8", 208 },
-        //    { "9", 209 },
-        //    { "0", 210 },
-        //    { "*", 211 },
-        //    { "#", 212 },
-        //};
-
-		/// <summary>
-		/// 
-		/// </summary>
-		CodecActiveCallItem CurrentCallItem;
-
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="eisc"></param>
-		/// <param name="messagePath"></param>
-		public SIMPLAtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-            EISC = eisc;
-
-            JoinMap = new SIMPLAtcJoinMap(201);
-
-			CurrentCallItem = new CodecActiveCallItem();
-			CurrentCallItem.Type = eCodecCallType.Audio;
-			CurrentCallItem.Id = "-audio-";
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void SendFullStatus()
-		{
-            
-
-			this.PostStatusMessage(new
-			{				
-				calls = GetCurrentCallList(),
-				currentCallString = EISC.GetString(JoinMap.CurrentCallName.JoinNumber),
-				currentDialString = EISC.GetString(JoinMap.CurrentDialString.JoinNumber),
-                isInCall = EISC.GetString(JoinMap.HookState.JoinNumber) == "Connected"
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));
-
-            EISC.SetStringSigAction(JoinMap.HookState.JoinNumber, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-                //GetCurrentCallList();
-				SendFullStatus();
-			});
-
-            EISC.SetStringSigAction(JoinMap.CurrentCallNumber.JoinNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                SendCallsList();
-			});
-
-            EISC.SetStringSigAction(JoinMap.CurrentCallName.JoinNumber, s =>
-            {
-                CurrentCallItem.Name = s;
-                SendCallsList();
-            });
-
-            EISC.SetStringSigAction(JoinMap.CallDirection.JoinNumber, s =>
-            {
-                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
-                SendCallsList();
-            });
-
-			// Add press and holds using helper
-			Action<string, uint> addPHAction = (s, u) => 
-				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-
-			// Add straight pulse calls
-			Action<string, uint> addAction = (s, u) =>
-				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-            addAction("/endCallById", JoinMap.EndCall.JoinNumber);
-            addAction("/endAllCalls", JoinMap.EndCall.JoinNumber);
-            addAction("/acceptById", JoinMap.IncomingAnswer.JoinNumber);
-            addAction("/rejectById", JoinMap.IncomingReject.JoinNumber);
-
-            var speeddialStart = JoinMap.SpeedDialStart.JoinNumber;
-            var speeddialEnd = JoinMap.SpeedDialStart.JoinNumber + JoinMap.SpeedDialStart.JoinSpan;
-
-            var speedDialIndex = 1;
-            for (uint i = speeddialStart; i < speeddialEnd; i++)
-            {
-                addAction(string.Format("/speedDial{0}", speedDialIndex), i);
-                speedDialIndex++;
-            }
-
-			// Get status
-			AppServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullStatus));
-			// Dial on string
-            AppServerController.AddAction(MessagePath + "/dial", new Action<string>(s => EISC.SetString(JoinMap.CurrentDialString.JoinNumber, s)));
-			// Pulse DTMF
-			AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-			{
-                var join = JoinMap.Joins[s];           
-                if (join != null)
-                {
-                    if (join.JoinNumber > 0)
-                    {
-                        EISC.PulseBool(join.JoinNumber, 100);
-                    }
-                }
-			}));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-        void SendCallsList()
-        {
-            PostStatusMessage(new
-            {
-                calls = GetCurrentCallList(),
-            });
-        }
-
-		/// <summary>
-		/// Turns the 
-		/// </summary>
-		/// <returns></returns>
-		List<CodecActiveCallItem> GetCurrentCallList()
-		{
-			if (CurrentCallItem.Status == eCodecCallStatus.Disconnected)
-			{
-				return new List<CodecActiveCallItem>();
-			}
-			else
-			{
-				return new List<CodecActiveCallItem>() { CurrentCallItem };
-			}
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/SIMPLCameraMessenger.cs

@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Bridges;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class SIMPLCameraMessenger : MessengerBase
-    {
-        BasicTriList EISC;
-
-        CameraControllerJoinMap JoinMap;
-
-
-        public SIMPLCameraMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
-            : base(key, messagePath)
-        {
-            EISC = eisc;
-
-            JoinMap = new CameraControllerJoinMap(joinStart);
-
-            EISC.SetUShortSigAction(JoinMap.NumberOfPresets.JoinNumber, (u) => SendCameraFullMessageObject());
-
-            EISC.SetBoolSigAction(JoinMap.CameraModeAuto.JoinNumber, (b) => PostCameraMode());
-            EISC.SetBoolSigAction(JoinMap.CameraModeManual.JoinNumber, (b) => PostCameraMode());
-            EISC.SetBoolSigAction(JoinMap.CameraModeOff.JoinNumber, (b) => PostCameraMode());
-        }
-
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            var asc = appServerController;
-
-            asc.AddAction(MessagePath + "/fullStatus", new Action(SendCameraFullMessageObject));
-
-            // Add press and holds using helper action
-            Action<string, uint> addPHAction = (s, u) =>
-                asc.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-            addPHAction("/cameraUp", JoinMap.TiltUp.JoinNumber);
-            addPHAction("/cameraDown", JoinMap.TiltDown.JoinNumber);
-            addPHAction("/cameraLeft", JoinMap.PanLeft.JoinNumber);
-            addPHAction("/cameraRight", JoinMap.PanRight.JoinNumber);
-            addPHAction("/cameraZoomIn", JoinMap.ZoomIn.JoinNumber);
-            addPHAction("/cameraZoomOut", JoinMap.ZoomOut.JoinNumber);
-
-            Action<string, uint> addAction = (s, u) =>
-                asc.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-
-            addAction("/cameraModeAuto", JoinMap.CameraModeAuto.JoinNumber);
-            addAction("/cameraModeManual", JoinMap.CameraModeManual.JoinNumber);
-            addAction("/cameraModeOff", JoinMap.CameraModeOff.JoinNumber);
-
-            var presetStart = JoinMap.PresetRecallStart.JoinNumber;
-            var presetEnd = JoinMap.PresetRecallStart.JoinNumber + JoinMap.PresetRecallStart.JoinSpan;
-
-            int presetId = 1;
-            // camera presets
-            for (uint i = presetStart; i <= presetEnd; i++)
-            {
-                addAction("/cameraPreset" + (presetId), i);
-                presetId++;
-            }
-        }
-
-        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.RemoveAction(MessagePath + "/fullStatus");
-
-            appServerController.RemoveAction(MessagePath + "/cameraUp");
-            appServerController.RemoveAction(MessagePath + "/cameraDown");
-            appServerController.RemoveAction(MessagePath + "/cameraLeft");
-            appServerController.RemoveAction(MessagePath + "/cameraRight");
-            appServerController.RemoveAction(MessagePath + "/cameraZoomIn");
-            appServerController.RemoveAction(MessagePath + "/cameraZoomOut");
-            appServerController.RemoveAction(MessagePath + "/cameraModeAuto");
-            appServerController.RemoveAction(MessagePath + "/cameraModeManual");
-            appServerController.RemoveAction(MessagePath + "/cameraModeOff");
-
-            EISC.SetUShortSigAction(JoinMap.NumberOfPresets.JoinNumber, null);
-
-            EISC.SetBoolSigAction(JoinMap.CameraModeAuto.JoinNumber, null);
-            EISC.SetBoolSigAction(JoinMap.CameraModeManual.JoinNumber, null);
-            EISC.SetBoolSigAction(JoinMap.CameraModeOff.JoinNumber, null);
-        }
-
-        /// <summary>
-        /// Helper method to update the full status of the camera
-        /// </summary>
-        void SendCameraFullMessageObject()
-        {
-            var presetList = new List<CameraPreset>();
-
-            // Build a list of camera presets based on the names and count 
-            if (EISC.GetBool(JoinMap.SupportsPresets.JoinNumber))
-            {
-                var presetStart = JoinMap.PresetLabelStart.JoinNumber;
-                var presetEnd = JoinMap.PresetLabelStart.JoinNumber + JoinMap.NumberOfPresets.JoinNumber;
-
-                var presetId = 1;
-                for (uint i = presetStart; i < presetEnd; i++)
-                {
-                    var presetName = EISC.GetString(i);
-                    var preset = new CameraPreset(presetId, presetName, string.IsNullOrEmpty(presetName), true);
-                    presetList.Add(preset);
-                    presetId++;
-                }
-            }
-
-            PostStatusMessage(new
-            {
-                cameraMode = GetCameraMode(),
-                hasPresets = EISC.GetBool(JoinMap.SupportsPresets.JoinNumber),
-                presets = presetList
-            });
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void PostCameraMode()
-        {
-            PostStatusMessage(new
-            {
-                cameraMode = GetCameraMode()
-            });
-        }
-
-        /// <summary>
-        /// Computes the current camera mode
-        /// </summary>
-        /// <returns></returns>
-        string GetCameraMode()
-        {
-            string m;
-            if (EISC.GetBool(JoinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
-            else if (EISC.GetBool(JoinMap.CameraModeManual.JoinNumber)) m = eCameraControlMode.Manual.ToString().ToLower();
-            else m = eCameraControlMode.Off.ToString().ToLower();
-            return m;
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/SIMPLRouteMessenger.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    public class SIMPLRouteMessenger : MessengerBase
-    {
-        BasicTriList EISC;
-
-        uint JoinStart;
-
-        public class StringJoin
-        {
-            /// <summary>
-            /// 1
-            /// </summary>
-            public const uint CurrentSource = 1;
-        }
-
-        public SIMPLRouteMessenger(string key, BasicTriList eisc, string messagePath, uint joinStart)
-            : base(key, messagePath)
-        {
-            EISC = eisc;
-            JoinStart = joinStart - 1;
-
-            EISC.SetStringSigAction(JoinStart + StringJoin.CurrentSource, (s) => SendRoutingFullMessageObject(s));
-        }
-
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.AddAction(MessagePath + "/fullStatus", new Action(() =>
-                {
-                    SendRoutingFullMessageObject(EISC.GetString(JoinStart + StringJoin.CurrentSource));
-                }));
-
-            appServerController.AddAction(MessagePath +"/source", new Action<SourceSelectMessageContent>(c =>
-                {
-                    EISC.SetString(JoinStart + StringJoin.CurrentSource, c.SourceListItem);
-                }));
-
-        }
-
-        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
-        {
-            appServerController.RemoveAction(MessagePath + "/fullStatus");
-            appServerController.RemoveAction(MessagePath + "/source");
-
-            EISC.SetStringSigAction(JoinStart + StringJoin.CurrentSource, null);
-        }
-
-        /// <summary>
-        /// Helper method to update full status of the routing device
-        /// </summary>
-        void SendRoutingFullMessageObject(string sourceKey)
-        {
-            if (string.IsNullOrEmpty(sourceKey))
-                sourceKey = "none";
-
-            PostStatusMessage(new
-            {
-                selectedSourceKey = sourceKey
-            });
-        }
-    }
-}

PepperDashEssentials/AppServer/Messengers/SIMPLVtcMessenger.cs

@@ -1,665 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.EthernetCommunication;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.Codec;
-using PepperDash.Essentials.Devices.Common.Cameras;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-	public class SIMPLVtcMessenger : MessengerBase
-	{
-		BasicTriList EISC;
-
-        public SIMPLVtcJoinMap JoinMap { get; private set; }
-
-        ///********* Bools *********/
-        ///// <summary>
-        ///// 724
-        ///// </summary>
-        //const uint BDialHangup = 724;
-        ///// <summary>
-        ///// 750
-        ///// </summary>
-        //const uint BCallIncoming = 750;
-        ///// <summary>
-        ///// 751
-        ///// </summary>
-        //const uint BIncomingAnswer = 751;
-        ///// <summary>
-        ///// 752
-        ///// </summary>
-        //const uint BIncomingReject = 752;
-        ///// <summary>
-        ///// 741
-        ///// </summary>
-        //const uint BSpeedDial1 = 741;
-        ///// <summary>
-        ///// 742
-        ///// </summary>
-        //const uint BSpeedDial2 = 742;
-        ///// <summary>
-        ///// 743
-        ///// </summary>
-        //const uint BSpeedDial3 = 743;
-        ///// <summary>
-        ///// 744
-        ///// </summary>
-        //const uint BSpeedDial4 = 744;
-        ///// <summary>
-        ///// 800
-        ///// </summary>
-        //const uint BDirectorySearchBusy = 800;
-        ///// <summary>
-        ///// 801 
-        ///// </summary>
-        //const uint BDirectoryLineSelected = 801;
-        ///// <summary>
-        ///// 801 when selected entry is a contact
-        ///// </summary>
-        //const uint BDirectoryEntryIsContact = 801;
-        ///// <summary>
-        ///// 802 To show/hide back button
-        ///// </summary>
-        //const uint BDirectoryIsRoot = 802;
-        ///// <summary>
-        ///// 803 Pulse from system to inform us when directory is ready
-        ///// </summary>
-        //const uint BDirectoryHasChanged = 803;
-        ///// <summary>
-        ///// 804
-        ///// </summary>
-        //const uint BDirectoryRoot = 804;
-        ///// <summary>
-        ///// 805
-        ///// </summary>
-        //const uint BDirectoryFolderBack = 805;
-        ///// <summary>
-        ///// 806
-        ///// </summary>
-        //const uint BDirectoryDialSelectedLine = 806;
-        ///// <summary>
-        ///// 811
-        ///// </summary>
-        //const uint BCameraControlUp = 811;
-        ///// <summary>
-        ///// 812
-        ///// </summary>
-        //const uint BCameraControlDown = 812;
-        ///// <summary>
-        ///// 813
-        ///// </summary>
-        //const uint BCameraControlLeft = 813;
-        ///// <summary>
-        ///// 814
-        ///// </summary>
-        //const uint BCameraControlRight = 814;
-        ///// <summary>
-        ///// 815
-        ///// </summary>
-        //const uint BCameraControlZoomIn = 815;
-        ///// <summary>
-        ///// 816
-        ///// </summary>
-        //const uint BCameraControlZoomOut = 816;
-        ///// <summary>
-        ///// 821 - 826
-        ///// </summary>
-        //const uint BCameraPresetStart = 821;
-
-        ///// <summary>
-        ///// 831
-        ///// </summary>
-        //const uint BCameraModeAuto = 831;
-        ///// <summary>
-        ///// 832
-        ///// </summary>
-        //const uint BCameraModeManual = 832;
-        ///// <summary>
-        ///// 833
-        ///// </summary>
-        //const uint BCameraModeOff = 833;
-
-        ///// <summary>
-        ///// 841
-        ///// </summary>
-        //const uint BCameraSelfView = 841;
-
-        ///// <summary>
-        ///// 842
-        ///// </summary>
-        //const uint BCameraLayout = 842;
-        ///// <summary>
-        ///// 843
-        ///// </summary>
-        //const uint BCameraSupportsAutoMode = 843;
-        ///// <summary>
-        ///// 844
-        ///// </summary>
-        //const uint BCameraSupportsOffMode = 844;
-
-
-        ///********* Ushorts *********/
-        ///// <summary>
-        ///// 760
-        ///// </summary>
-        //const uint UCameraNumberSelect = 760;
-        ///// <summary>
-        ///// 801
-        ///// </summary>
-        //const uint UDirectorySelectRow = 801;
-        ///// <summary>
-        ///// 801
-        ///// </summary>
-        //const uint UDirectoryRowCount = 801;
-
-
-
-        ///********* Strings *********/
-        ///// <summary>
-        ///// 701
-        ///// </summary>
-        //const uint SCurrentDialString = 701;
-        ///// <summary>
-        ///// 702
-        ///// </summary>
-        //const uint SCurrentCallName = 702;
-        ///// <summary>
-        ///// 703
-        ///// </summary>
-        //const uint SCurrentCallNumber = 703;
-        ///// <summary>
-        ///// 731
-        ///// </summary>
-        //const uint SHookState = 731;
-        ///// <summary>
-        ///// 722
-        ///// </summary>
-        //const uint SCallDirection = 722;
-        ///// <summary>
-        ///// 751
-        ///// </summary>
-        //const uint SIncomingCallName = 751;
-        ///// <summary>
-        ///// 752
-        ///// </summary>
-        //const uint SIncomingCallNumber = 752;
-
-        ///// <summary>
-        ///// 800
-        ///// </summary>
-        //const uint SDirectorySearchString = 800;
-        ///// <summary>
-        ///// 801-1055
-        ///// </summary>
-        //const uint SDirectoryEntriesStart = 801;
-        ///// <summary>
-        ///// 1056
-        ///// </summary>
-        //const uint SDirectoryEntrySelectedName = 1056;
-        ///// <summary>
-        ///// 1057
-        ///// </summary>
-        //const uint SDirectoryEntrySelectedNumber = 1057;
-        ///// <summary>
-        ///// 1058
-        ///// </summary>
-        //const uint SDirectorySelectedFolderName = 1058;
-
-
-        ///// <summary>
-        ///// 701-712 0-9*#
-        ///// </summary>
-        //Dictionary<string, uint> DTMFMap = new Dictionary<string, uint>
-        //{
-        //    { "1", 701 },
-        //    { "2", 702 },
-        //    { "3", 703 },
-        //    { "4", 704 },
-        //    { "5", 705 },
-        //    { "6", 706 },
-        //    { "7", 707 },
-        //    { "8", 708 },
-        //    { "9", 709 },
-        //    { "0", 710 },
-        //    { "*", 711 },
-        //    { "#", 712 },
-        //};
-
-		CodecActiveCallItem CurrentCallItem;
-		CodecActiveCallItem IncomingCallItem;
-
-		ushort PreviousDirectoryLength = 701;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="eisc"></param>
-		/// <param name="messagePath"></param>
-		public SIMPLVtcMessenger(string key, BasicTriList eisc, string messagePath)
-			: base(key, messagePath)
-		{
-			EISC = eisc;
-
-            JoinMap = new SIMPLVtcJoinMap(701);
-
-			CurrentCallItem = new CodecActiveCallItem();
-			CurrentCallItem.Type = eCodecCallType.Video;
-			CurrentCallItem.Id = "-video-";
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="appServerController"></param>
-		protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-		{
-			var asc = appServerController;
-			EISC.SetStringSigAction(JoinMap.HookState.JoinNumber, s => 
-			{
-				CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
-				PostFullStatus(); // SendCallsList();
-			});
-
-			EISC.SetStringSigAction(JoinMap.CurrentCallNumber.JoinNumber, s => 
-			{
-				CurrentCallItem.Number = s;
-                PostCallsList();
-			});
-
-            EISC.SetStringSigAction(JoinMap.CurrentCallName.JoinNumber, s =>
-            {
-                CurrentCallItem.Name = s;
-                PostCallsList();
-            });
-
-            EISC.SetStringSigAction(JoinMap.CallDirection.JoinNumber, s =>
-            {
-                CurrentCallItem.Direction = (eCodecCallDirection)Enum.Parse(typeof(eCodecCallDirection), s, true);
-                PostCallsList();
-            });
-
-			EISC.SetBoolSigAction(JoinMap.IncomingCall.JoinNumber, b =>
-			{
-				if (b)
-				{
-					var ica = new CodecActiveCallItem()
-					{
-						Direction = eCodecCallDirection.Incoming,
-						Id = "-video-incoming",
-						Name = EISC.GetString(JoinMap.IncomingCallName.JoinNumber),
-						Number = EISC.GetString(JoinMap.IncomingCallNumber.JoinNumber),
-						Status = eCodecCallStatus.Ringing,
-						Type = eCodecCallType.Video
-					};
-					IncomingCallItem = ica;
-				}
-				else
-				{
-					IncomingCallItem = null;
-				}
-				PostCallsList();
-			});
-
-			EISC.SetBoolSigAction(JoinMap.CameraSupportsAutoMode.JoinNumber, b =>
-			{
-				PostStatusMessage(new
-				{	
-					cameraSupportsAutoMode = b
-				});
-			});
-			EISC.SetBoolSigAction(JoinMap.CameraSupportsOffMode.JoinNumber, b =>
-			{
-				PostStatusMessage(new
-				{
-					cameraSupportsOffMode = b
-				});
-			});
-
-			// Directory insanity
-			EISC.SetUShortSigAction(JoinMap.DirectoryRowCount.JoinNumber, u =>
-			{
-				// The length of the list comes in before the list does.
-				// Splice the sig change operation onto the last string sig that will be changing
-				// when the directory entries make it through.
-				if (PreviousDirectoryLength > 0)
-				{
-					EISC.ClearStringSigAction(JoinMap.DirectoryEntriesStart.JoinNumber + PreviousDirectoryLength - 1);
-				}
-				EISC.SetStringSigAction(JoinMap.DirectoryEntriesStart.JoinNumber + u - 1, s => PostDirectory());
-				PreviousDirectoryLength = u;
-			});
-
-			EISC.SetStringSigAction(JoinMap.DirectoryEntrySelectedName.JoinNumber, s =>
-			{
-				PostStatusMessage(new
-				{
-					directoryContactSelected = new
-					{
-						name = EISC.GetString(JoinMap.DirectoryEntrySelectedName.JoinNumber),
-					}
-				});
-			});
-
-			EISC.SetStringSigAction(JoinMap.DirectoryEntrySelectedNumber.JoinNumber, s =>
-			{
-				PostStatusMessage(new
-				{
-					directoryContactSelected = new
-					{
-						number = EISC.GetString(JoinMap.DirectoryEntrySelectedNumber.JoinNumber),
-					}
-				});
-			});
-
-			EISC.SetStringSigAction(JoinMap.DirectorySelectedFolderName.JoinNumber, s => PostStatusMessage(new
-			{
-				directorySelectedFolderName = EISC.GetString(JoinMap.DirectorySelectedFolderName.JoinNumber)
-			}));
-
-			EISC.SetSigTrueAction(JoinMap.CameraModeAuto.JoinNumber, () => PostCameraMode());
-			EISC.SetSigTrueAction(JoinMap.CameraModeManual.JoinNumber, () => PostCameraMode());
-			EISC.SetSigTrueAction(JoinMap.CameraModeOff.JoinNumber, () => PostCameraMode());
-
-			EISC.SetBoolSigAction(JoinMap.CameraSelfView.JoinNumber, b => PostStatusMessage(new 
-				{
-					cameraSelfView = b
-				}));
-
-			EISC.SetUShortSigAction(JoinMap.CameraNumberSelect.JoinNumber, (u) => PostSelectedCamera());
-
-
-			// Add press and holds using helper action
-			Action<string, uint> addPHAction = (s, u) => 
-				AppServerController.AddAction(MessagePath + s, new PressAndHoldAction(b => EISC.SetBool(u, b)));
-			addPHAction("/cameraUp", JoinMap.CameraTiltUp.JoinNumber);
-			addPHAction("/cameraDown", JoinMap.CameraTiltDown.JoinNumber);
-			addPHAction("/cameraLeft", JoinMap.CameraPanLeft.JoinNumber);
-			addPHAction("/cameraRight", JoinMap.CameraPanRight.JoinNumber);
-			addPHAction("/cameraZoomIn", JoinMap.CameraZoomIn.JoinNumber);
-			addPHAction("/cameraZoomOut", JoinMap.CameraZoomOut.JoinNumber);
-
-			// Add straight pulse calls using helper action
-			Action<string, uint> addAction = (s, u) =>
-				AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
-			addAction("/endCallById", JoinMap.EndCall.JoinNumber);
-			addAction("/endAllCalls", JoinMap.EndCall.JoinNumber);
-            addAction("/acceptById", JoinMap.IncomingAnswer.JoinNumber);
-            addAction("/rejectById", JoinMap.IncomingReject.JoinNumber);
-
-            var speeddialStart = JoinMap.SpeedDialStart.JoinNumber;
-            var speeddialEnd = JoinMap.SpeedDialStart.JoinNumber + JoinMap.SpeedDialStart.JoinSpan;
-
-            var speedDialIndex = 1;
-            for (uint i = speeddialStart; i < speeddialEnd; i++)
-            {
-                addAction(string.Format("/speedDial{0}", speedDialIndex), i);
-                speedDialIndex++;
-            }
-
-			addAction("/cameraModeAuto", JoinMap.CameraModeAuto.JoinNumber);
-			addAction("/cameraModeManual", JoinMap.CameraModeManual.JoinNumber);
-			addAction("/cameraModeOff", JoinMap.CameraModeOff.JoinNumber);
-			addAction("/cameraSelfView", JoinMap.CameraSelfView.JoinNumber);
-			addAction("/cameraLayout", JoinMap.CameraLayout.JoinNumber);
-
-			asc.AddAction("/cameraSelect", new Action<string>(SelectCamera));
-
-			// camera presets
-			for(uint i = 0; i < 6; i++) 
-			{
-				addAction("/cameraPreset" + (i + 1), JoinMap.CameraPresetStart.JoinNumber + i);
-			}
-
-			asc.AddAction(MessagePath + "/isReady", new Action(PostIsReady));
-			// Get status
-			asc.AddAction(MessagePath + "/fullStatus", new Action(PostFullStatus));
-			// Dial on string
-			asc.AddAction(MessagePath + "/dial", new Action<string>(s => 
-				EISC.SetString(JoinMap.CurrentDialString.JoinNumber, s)));
-            // Pulse DTMF
-            AppServerController.AddAction(MessagePath + "/dtmf", new Action<string>(s =>
-            {
-                var join = JoinMap.Joins[s];           
-                if (join != null)
-                {
-                    if (join.JoinNumber > 0)
-                    {
-                        EISC.PulseBool(join.JoinNumber, 100);
-                    }
-                }
-            }));
-
-			// Directory madness
-			asc.AddAction(MessagePath + "/directoryRoot", new Action(() => EISC.PulseBool(JoinMap.DirectoryRoot.JoinNumber)));
-			asc.AddAction(MessagePath + "/directoryBack", new Action(() => EISC.PulseBool(JoinMap.DirectoryFolderBack.JoinNumber)));
-			asc.AddAction(MessagePath + "/directoryById", new Action<string>(s =>
-			{
-				// the id should contain the line number to forward to simpl
-				try
-				{
-					var u = ushort.Parse(s);
-					EISC.SetUshort(JoinMap.DirectorySelectRow.JoinNumber, u);
-					EISC.PulseBool(JoinMap.DirectoryLineSelected.JoinNumber);
-				}
-				catch (Exception)
-				{
-					Debug.Console(1, this, Debug.ErrorLogLevel.Warning, 
-						"/directoryById request contains non-numeric ID incompatible with DDVC bridge");
-				}
-
-			}));
-			asc.AddAction(MessagePath + "/directorySelectContact", new Action<string>(s =>
-			{
-				try
-				{
-					var u = ushort.Parse(s);
-					EISC.SetUshort(JoinMap.DirectorySelectRow.JoinNumber, u);
-					EISC.PulseBool(JoinMap.DirectoryLineSelected.JoinNumber);
-				}
-				catch
-				{
-					
-				}
-			}));
-			asc.AddAction(MessagePath + "/directoryDialContact", new Action(() => {
-				EISC.PulseBool(JoinMap.DirectoryDialSelectedLine.JoinNumber);
-			}));
-			asc.AddAction(MessagePath + "/getDirectory", new Action(() =>
-			{
-				if (EISC.GetUshort(JoinMap.DirectoryRowCount.JoinNumber) > 0)
-				{
-					PostDirectory();
-				}
-				else
-				{
-                    EISC.PulseBool(JoinMap.DirectoryRoot.JoinNumber);
-				}
-			}));
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostFullStatus()
-		{
-			this.PostStatusMessage(new
-			{
-				calls = GetCurrentCallList(),
-				cameraMode = GetCameraMode(),
-				cameraSelfView = EISC.GetBool(JoinMap.CameraSelfView.JoinNumber),
-				cameraSupportsAutoMode = EISC.GetBool(JoinMap.CameraSupportsAutoMode.JoinNumber),
-				cameraSupportsOffMode = EISC.GetBool(JoinMap.CameraSupportsOffMode.JoinNumber),
-				currentCallString = EISC.GetString(JoinMap.CurrentCallNumber.JoinNumber),
-				currentDialString = EISC.GetString(JoinMap.CurrentDialString.JoinNumber),
-				directoryContactSelected = new
-				{
-					name = EISC.GetString(JoinMap.DirectoryEntrySelectedName.JoinNumber),
-					number = EISC.GetString(JoinMap.DirectoryEntrySelectedNumber.JoinNumber)
-				},
-				directorySelectedFolderName = EISC.GetString(JoinMap.DirectorySelectedFolderName.JoinNumber),
-                isInCall = EISC.GetString(JoinMap.HookState.JoinNumber) == "Connected",
-				hasDirectory = true,
-				hasDirectorySearch = false,
-				hasRecents = !EISC.BooleanOutput[502].BoolValue,
-				hasCameras = true,
-				showCamerasWhenNotInCall = EISC.BooleanOutput[503].BoolValue,
-				selectedCamera = GetSelectedCamera(),
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostDirectory()
-		{
-			var u = EISC.GetUshort(JoinMap.DirectoryRowCount.JoinNumber);
-			var items = new List<object>();
-			for (uint i = 0; i < u; i++)
-			{
-				var name = EISC.GetString(JoinMap.DirectoryEntriesStart.JoinNumber + i);
-				var id = (i + 1).ToString();
-				// is folder or contact?
-				if (name.StartsWith("[+]"))
-				{
-					items.Add(new
-					{
-						folderId = id,
-						name = name
-					});
-				}
-				else
-				{
-					items.Add(new
-					{
-						contactId = id,
-						name = name
-					});
-				}
-			}
-
-			var directoryMessage = new
-			{
-				currentDirectory = new
-				{
-                    isRootDirectory = EISC.GetBool(JoinMap.DirectoryIsRoot.JoinNumber),
-					directoryResults = items
-				}
-			};
-			PostStatusMessage(directoryMessage);
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostCameraMode()
-		{
-			PostStatusMessage(new
-			{
-				cameraMode = GetCameraMode()
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="mode"></param>
-		string GetCameraMode()
-		{
-			string m;
-            if (EISC.GetBool(JoinMap.CameraModeAuto.JoinNumber)) m = eCameraControlMode.Auto.ToString().ToLower();
-            else if (EISC.GetBool(JoinMap.CameraModeManual.JoinNumber)) m = eCameraControlMode.Manual.ToString().ToLower();
-            else m = eCameraControlMode.Off.ToString().ToLower();
-			return m;
-		}
-
-		void PostSelectedCamera()
-		{
-			PostStatusMessage(new
-			{
-				selectedCamera = GetSelectedCamera()
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		string GetSelectedCamera()
-		{
-            var num = EISC.GetUshort(JoinMap.CameraNumberSelect.JoinNumber);
-			string m;
-			if (num == 100)
-			{
-				m = "cameraFar";
-			}
-			else
-			{
-				m = "camera" + num;
-			}
-			return m;
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-		void PostIsReady()
-		{
-			PostStatusMessage(new
-			{
-				isReady = true
-			});
-		}
-
-		/// <summary>
-		/// 
-		/// </summary>
-        void PostCallsList()
-        {
-            PostStatusMessage(new
-            {
-                calls = GetCurrentCallList(),
-            });
-        }
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="s"></param>
-		void SelectCamera(string s)
-		{
-			var cam = s.Substring(6);
-			if (cam.ToLower() == "far")
-			{
-				EISC.SetUshort(JoinMap.CameraNumberSelect.JoinNumber, 100);
-			}
-			else
-			{
-                EISC.SetUshort(JoinMap.CameraNumberSelect.JoinNumber, UInt16.Parse(cam));
-			}
-		}
-
-		/// <summary>
-		/// Turns the 
-		/// </summary>
-		/// <returns></returns>
-		List<CodecActiveCallItem> GetCurrentCallList()
-		{
-			var list = new List<CodecActiveCallItem>();
-			if (CurrentCallItem.Status != eCodecCallStatus.Disconnected)
-			{
-				list.Add(CurrentCallItem);
-			}
-            if (EISC.GetBool(JoinMap.IncomingCall.JoinNumber))
-            {
-
-			}
-			return list;
-		}
-	}
-}

PepperDashEssentials/AppServer/Messengers/SimplMessengerPropertiesConfig.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Bridges;
-
-namespace PepperDash.Essentials.AppServer.Messengers
-{
-    /// <summary>
-    /// Properties to configure a SIMPL Messenger
-    /// </summary>
-    public class SimplMessengerPropertiesConfig : EiscApiPropertiesConfig.ApiDevicePropertiesConfig
-    {
-    }
-}

PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs

@@ -1,5 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Monitoring;
 
@@ -17,11 +23,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
             SysMon = sysMon;
 
-            SysMon.SystemMonitorPropertiesChanged += SysMon_SystemMonitorPropertiesChanged;
+            SysMon.SystemMonitorPropertiesChanged += new EventHandler<EventArgs>(SysMon_SystemMonitorPropertiesChanged);
 
             foreach (var p in SysMon.ProgramStatusFeedbackCollection)
             {
-                p.Value.ProgramInfoChanged += ProgramInfoChanged;
+                p.Value.ProgramInfoChanged += new EventHandler<ProgramInfoEventArgs>(ProgramInfoChanged);
             }
 
             CrestronConsole.AddNewConsoleCommand(s => SendFullStatusMessage(), "SendFullSysMonStatus", "Sends the full System Monitor Status", ConsoleAccessLevelEnum.AccessOperator);
@@ -66,15 +72,18 @@ namespace PepperDash.Essentials.AppServer.Messengers
             Debug.Console(1, "Posting System Monitor Status Message.");
 
             // This takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke(o => PostStatusMessage(new
+            CrestronInvoke.BeginInvoke((o) =>
             {
-                timeZone = SysMon.TimeZoneFeedback.IntValue,
-                timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
-                ioControllerVersion = SysMon.IoControllerVersionFeedback.StringValue,
-                snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
-                bacnetVersion = SysMon.BaCnetAppVersionFeedback.StringValue,
-                controllerVersion = SysMon.ControllerVersionFeedback.StringValue
-            }));
+                PostStatusMessage(new
+                {
+                    timeZone = SysMon.TimeZoneFeedback.IntValue,
+                    timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
+                    ioControllerVersion = SysMon.IOControllerVersionFeedback.StringValue,
+                    snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
+                    bacnetVersion = SysMon.BACnetAppVersionFeedback.StringValue,
+                    controllerVersion = SysMon.ControllerVersionFeedback.StringValue
+                });
+            });
         }
 
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)

PepperDashEssentials/AppServer/Messengers/VideoCodecBaseMessenger.cs

@@ -7,8 +7,6 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-using PepperDash.Core;
-
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
@@ -204,59 +202,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
             {
                 appServerController.AddAction(MessagePath + "/getCallHistory", new Action(GetCallHistory));
             }
-			var cameraCodec = Codec as IHasCodecCameras;
-            if (cameraCodec != null)
-            {
-                Debug.Console(2, this, "Adding IHasCodecCameras Actions");
-
-                cameraCodec.CameraSelected += new EventHandler<CameraSelectedEventArgs>(cameraCodec_CameraSelected);
-
-                appServerController.AddAction(MessagePath + "/cameraSelect", new Action<string>(s => cameraCodec.SelectCamera(s)));
-
-                MapCameraActions();
-
-                var presetsCodec = Codec as IHasCodecRoomPresets;
-                if (presetsCodec != null)
-                {
-                    Debug.Console(2, this, "Adding IHasCodecRoomPresets Actions");
-
-                    presetsCodec.CodecRoomPresetsListHasChanged += new EventHandler<EventArgs>(presetsCodec_CameraPresetsListHasChanged);
-
-                    appServerController.AddAction(MessagePath + "/cameraPreset", new Action<int>(u => presetsCodec.CodecRoomPresetSelect(u)));
-                    appServerController.AddAction(MessagePath + "/cameraPresetStore", new Action<CodecRoomPreset>(p => presetsCodec.CodecRoomPresetStore(p.ID, p.Description)));
-                }
-
-                var speakerTrackCodec = Codec as IHasCameraAutoMode;
-                if (speakerTrackCodec != null)
-                {
-                    Debug.Console(2, this, "Adding IHasCameraAutoMode Actions");
-
-                    speakerTrackCodec.CameraAutoModeIsOnFeedback.OutputChange += new EventHandler<PepperDash.Essentials.Core.FeedbackEventArgs>(CameraAutoModeIsOnFeedback_OutputChange);
-
-                    appServerController.AddAction(MessagePath + "/cameraAuto", new Action(speakerTrackCodec.CameraAutoModeOn));
-                    appServerController.AddAction(MessagePath + "/cameraManual", new Action(speakerTrackCodec.CameraAutoModeOff));
-                }
-            }
-
-            var selfViewCodec = Codec as IHasCodecSelfView;
-
-            if (selfViewCodec != null)
-            {
-                Debug.Console(2, this, "Adding IHasCodecSelfView Actions");
-
-                appServerController.AddAction(MessagePath + "/cameraSelfView", new Action(selfViewCodec.SelfViewModeToggle));
-            }
-
-            var layoutsCodec = Codec as IHasCodecLayouts;
-
-            if (layoutsCodec != null)
-            {
-                Debug.Console(2, this, "Adding IHasCodecLayouts Actions");
-
-                appServerController.AddAction(MessagePath + "/cameraRemoteView", new Action(layoutsCodec.LocalLayoutToggle));
-            }
-
-            Debug.Console(2, this, "Adding Privacy & Standby Actions");
 
 			appServerController.AddAction(MessagePath + "/privacyModeOn", new Action(Codec.PrivacyModeOn));
 			appServerController.AddAction(MessagePath + "/privacyModeOff", new Action(Codec.PrivacyModeOff));
@@ -267,89 +212,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
 			appServerController.AddAction(MessagePath + "/standbyOff", new Action(Codec.StandbyDeactivate));
 		}
 
-        void presetsCodec_CameraPresetsListHasChanged(object sender, EventArgs e)
-        {
-            PostCameraPresets();
-        }
-
-        void CameraAutoModeIsOnFeedback_OutputChange(object sender, PepperDash.Essentials.Core.FeedbackEventArgs e)
-        {
-            PostCameraMode();
-        }
-
-
-        void cameraCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
-        {
-            MapCameraActions();
-            PostSelectedCamera();
-        }
-
-        /// <summary>
-        /// Maps the camera control actions to the current selected camera on the codec
-        /// </summary>
-        void MapCameraActions()
-        {
-            var cameraCodec = Codec as IHasCameras;
-
-            if (cameraCodec != null && cameraCodec.SelectedCamera != null)
-            {
-
-                AppServerController.RemoveAction(MessagePath + "/cameraUp");
-                AppServerController.RemoveAction(MessagePath + "/cameraDown");
-                AppServerController.RemoveAction(MessagePath + "/cameraLeft");
-                AppServerController.RemoveAction(MessagePath + "/cameraRight");
-                AppServerController.RemoveAction(MessagePath + "/cameraZoomIn");
-                AppServerController.RemoveAction(MessagePath + "/cameraZoomOut");
-                AppServerController.RemoveAction(MessagePath + "/cameraHome");
-
-                var camera = cameraCodec.SelectedCamera as IHasCameraPtzControl;
-                if (camera != null)
-                {
-                    AppServerController.AddAction(MessagePath + "/cameraUp", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.TiltUp(); else camera.TiltStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraDown", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.TiltDown(); else camera.TiltStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraLeft", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.PanLeft(); else camera.PanStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraRight", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.PanRight(); else camera.PanStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraZoomIn", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.ZoomIn(); else camera.ZoomStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraZoomOut", new PressAndHoldAction(new Action<bool>(b => { if (b)camera.ZoomOut(); else camera.ZoomStop(); })));
-                    AppServerController.AddAction(MessagePath + "/cameraHome", new Action(camera.PositionHome));
-
-                    var focusCamera = cameraCodec as IHasCameraFocusControl;
-
-                    AppServerController.RemoveAction(MessagePath + "/cameraAutoFocus");
-                    AppServerController.RemoveAction(MessagePath + "/cameraFocusNear");
-                    AppServerController.RemoveAction(MessagePath + "/cameraFocusFar");
-
-                    if (focusCamera != null)
-                    {
-                        AppServerController.AddAction(MessagePath + "/cameraAutoFocus", new Action(focusCamera.TriggerAutoFocus));
-                        AppServerController.AddAction(MessagePath + "/cameraFocusNear", new PressAndHoldAction(new Action<bool>(b => { if (b)focusCamera.FocusNear(); else focusCamera.FocusStop(); })));
-                        AppServerController.AddAction(MessagePath + "/cameraFocusFar", new PressAndHoldAction(new Action<bool>(b => { if (b)focusCamera.FocusFar(); else focusCamera.FocusStop(); })));
-                    }
-                }
-            }
-        }
-
-        string GetCameraMode()
-        {
-            string m = "";
-
-            var speakerTrackCodec = Codec as IHasCameraAutoMode;
-            if (speakerTrackCodec != null)
-            {
-                if (speakerTrackCodec.CameraAutoModeIsOnFeedback.BoolValue) m = eCameraControlMode.Auto.ToString();
-                else m = eCameraControlMode.Manual.ToString();
-            }
-
-            var cameraOffCodec = Codec as IHasCameraOff;
-            if (cameraOffCodec != null)
-            {
-                if (cameraOffCodec.CameraIsOffFeedback.BoolValue)
-                    m = eCameraControlMode.Off.ToString();
-            }
-
-            return m;
-        }
-
         void GetCallHistory()
         {
             var codec = (Codec as IHasCallHistory);
@@ -482,22 +344,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				return;
 			}
 
-            object cameraInfo = null;
-
-            var camerasCodec = Codec as IHasCodecCameras;
-            if (camerasCodec != null)
-            {
-                cameraInfo = new
-                {
-                    cameraManualSupported = true, // For now, we assume manual mode is supported and selectively hide controls based on camera selection
-                    cameraAutoSupported = Codec is IHasCameraAutoMode,
-                    cameraOffSupported = Codec is IHasCameraOff,
-                    cameraMode = GetCameraMode(),
-                    cameraList = camerasCodec.Cameras,
-                    selectedCamera = GetSelectedCamera(camerasCodec)
-                };
-            }
-
 			var info = Codec.CodecInfo;
 			PostStatusMessage(new
 			{
@@ -520,77 +366,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
 				hasDirectory = Codec is IHasDirectory,
                 hasDirectorySearch = true,
                 hasRecents = Codec is IHasCallHistory,
-                hasCameras = Codec is IHasCameras,
-                cameras = cameraInfo,
-                presets = GetCurrentPresets()
+                hasCameras = Codec is IHasCodecCameras
 			});
 		}
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void PostCameraMode()
-        {
-            PostStatusMessage(new
-            {
-                cameras = new
-                {
-                    cameraMode = GetCameraMode()
-                }
-            });
-        }
-
-        void PostSelectedCamera()
-        {
-            var camerasCodec = Codec as IHasCodecCameras;
-
-            PostStatusMessage(new
-            {
-                cameras = new
-                {
-                    selectedCamera = GetSelectedCamera(camerasCodec)
-                },
-                presets = GetCurrentPresets()
-            });
-        }
-
-        void PostCameraPresets()
-        {
-
-            PostStatusMessage(new
-            {
-                presets = GetCurrentPresets()
-			});
-		}
-		
-        object GetSelectedCamera(IHasCodecCameras camerasCodec)
-        {
-            return new
-                    {
-                        key = camerasCodec.SelectedCameraFeedback.StringValue,
-                        isFarEnd = camerasCodec.ControllingFarEndCameraFeedback.BoolValue,
-                        capabilites = new
-                        {
-                            canPan = camerasCodec.SelectedCamera.CanPan,
-                            canTilt = camerasCodec.SelectedCamera.CanTilt,
-                            canZoom = camerasCodec.SelectedCamera.CanZoom,
-                            canFocus = camerasCodec.SelectedCamera.CanFocus
-                        }
-                    };
-        }
-
-        List<CodecRoomPreset> GetCurrentPresets()
-        {
-            var presetsCodec = Codec as IHasCodecRoomPresets;
-
-            List<CodecRoomPreset> currentPresets = null;
-
-            if (presetsCodec != null && Codec is IHasFarEndCameraControl && (Codec as IHasFarEndCameraControl).ControllingFarEndCameraFeedback.BoolValue)
-                currentPresets = presetsCodec.FarEndRoomPresets;
-            else
-                currentPresets = presetsCodec.NearEndPresets;
-
-            return currentPresets;
-        }
 	}
 }

PepperDashEssentials/AppServer/MobileControlSystemController.cs

@@ -290,10 +290,6 @@ namespace PepperDash.Essentials
 									SystemUuid);
 							}
 						}
-						else
-						{
-							Debug.Console(0, "Authorization failed, code {0}: {1}", r.Code, r.ContentString);
-						}
 					}
 					else
 						Debug.Console(0, this, "Error {0} in authorizing system", e);

PepperDashEssentials/AppServer/RoomBridges/MobileControlDdvc01RoomBridge.cs

@@ -10,7 +10,6 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 using PepperDash.Core;
-using PepperDash.Essentials.AppServer;
 using PepperDash.Essentials.AppServer.Messengers;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
@@ -19,8 +18,204 @@ using PepperDash.Essentials.Room.Config;
 
 namespace PepperDash.Essentials.Room.MobileControl
 {
-	public class MobileControlSIMPLRoomBridge : MobileControlBridgeBase, IDelayedConfiguration
+	public class MobileControlDdvc01RoomBridge : MobileControlBridgeBase, IDelayedConfiguration
 	{
+		public class BoolJoin
+		{
+			/// <summary>
+			/// 301
+			/// </summary>
+			public const uint RoomIsOn = 301;
+
+			/// <summary>
+			/// 12
+			/// </summary>
+			public const uint PrivacyMute = 12;
+
+			/// <summary>
+			/// 41
+			/// </summary>
+			public const uint PromptForCode = 41;
+			/// <summary>
+			/// 42
+			/// </summary>
+			public const uint ClientJoined = 42;
+			/// <summary>
+			/// 51
+			/// </summary>
+			public const uint ActivityShare = 51;
+			/// <summary>
+			/// 52
+			/// </summary>
+			public const uint ActivityPhoneCall = 52;
+			/// <summary>
+			/// 53
+			/// </summary>
+			public const uint ActivityVideoCall = 53;
+
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint MasterVolumeIsMuted = 1;
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint MasterVolumeMuteToggle = 1;
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint VolumeMutesJoinStart = 1;
+			/// <summary>
+			/// 61
+			/// </summary>
+			public const uint ShutdownCancel = 61;
+			/// <summary>
+			/// 62
+			/// </summary>
+			public const uint ShutdownEnd = 62;			
+			/// <summary>
+			/// 63
+			/// </summary>
+			public const uint ShutdownStart = 63;
+			/// <summary>
+			/// 72
+			/// </summary>
+			public const uint SourceHasChanged = 71;
+
+			/// <summary>
+			/// 261 - The start of the range of speed dial visibles
+			/// </summary>
+			public const uint SpeedDialVisibleStartJoin = 261;
+			/// <summary>
+			/// 501
+			/// </summary>
+			public const uint ConfigIsReady = 501;
+			/// <summary>
+			/// 502
+			/// </summary>
+			public const uint HideVideoConfRecents = 502;
+			/// <summary>
+			/// 503
+			/// </summary>
+			public const uint ShowCameraWhenNotInCall = 503;
+			/// <summary>
+			/// 504
+			/// </summary>
+			public const uint UseSourceEnabled = 504;
+			/// <summary>
+			/// 601
+			/// </summary>
+			public const uint SourceShareDisableJoinStart = 601;
+			/// <summary>
+			/// 621
+			/// </summary>
+			public const uint SourceIsEnabledJoinStart = 621;
+
+		}
+
+		public class UshortJoin
+		{
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint MasterVolumeLevel = 1;
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint VolumeSlidersJoinStart = 1;
+			/// <summary>
+			/// 61
+			/// </summary>
+			public const uint ShutdownPromptDuration = 61;
+			/// <summary>
+			/// 101
+			/// </summary>
+			public const uint NumberOfAuxFaders = 101;
+		}
+
+		public class StringJoin
+		{
+			/// <summary>
+			/// 1
+			/// </summary>
+			public const uint VolumeSliderNamesJoinStart = 1;
+			/// <summary>
+			/// 71
+			/// </summary>
+			public const uint SelectedSourceKey = 71;
+
+			/// <summary>
+			/// 241
+			/// </summary>
+			public const uint SpeedDialNameStartJoin = 241;
+
+			/// <summary>
+			/// 251
+			/// </summary>
+			public const uint SpeedDialNumberStartJoin = 251;
+			
+			/// <summary>
+			/// 501
+			/// </summary>
+			public const uint ConfigRoomName = 501;
+			/// <summary>
+			/// 502
+			/// </summary>
+			public const uint ConfigHelpMessage = 502;
+			/// <summary>
+			/// 503
+			/// </summary>
+			public const uint ConfigHelpNumber = 503;
+			/// <summary>
+			/// 504
+			/// </summary>
+			public const uint ConfigRoomPhoneNumber = 504;
+			/// <summary>
+			/// 505
+			/// </summary>
+			public const uint ConfigRoomURI = 505;
+			/// <summary>
+			/// 401
+			/// </summary>
+			public const uint UserCodeToSystem = 401;
+			/// <summary>
+			/// 402
+			/// </summary>
+			public const uint ServerUrl = 402;
+			/// <summary>
+			/// 512
+			/// </summary>
+			public const uint RoomSpeedDialNamesJoinStart = 512;
+			/// <summary>
+			/// 516
+			/// </summary>
+			public const uint RoomSpeedDialNumberssJoinStart = 516;
+			/// <summary>
+			/// 601
+			/// </summary>
+			public const uint SourceNameJoinStart = 601;
+			/// <summary>
+			/// 621
+			/// </summary>
+			public const uint SourceIconJoinStart = 621;
+			/// <summary>
+			/// 641
+			/// </summary>
+			public const uint SourceKeyJoinStart = 641;
+			/// <summary>
+			/// 661
+			/// </summary>
+			public const uint SourceTypeJoinStart = 661;
+			/// <summary>
+			/// 761
+			/// </summary>
+			public const uint CameraNearNameStart = 761;
+			/// <summary>
+			/// 770 - presence of this name on the input will cause the camera to be added
+			/// </summary>
+			public const uint CameraFarName = 770;
+		}
+
 		/// <summary>
 		/// Fires when config is ready to go
 		/// </summary>
@@ -28,8 +223,6 @@ namespace PepperDash.Essentials.Room.MobileControl
 
 		public ThreeSeriesTcpIpEthernetIntersystemCommunications EISC { get; private set; }
 
-        public MobileControlSIMPLRoomJoinMap JoinMap { get; private set; }
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -38,15 +231,15 @@ namespace PepperDash.Essentials.Room.MobileControl
 		public override string RoomName
 		{
 			get { 
-				var name = EISC.StringOutput[JoinMap.ConfigRoomName.JoinNumber].StringValue;
+				var name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue;
 				return string.IsNullOrEmpty(name) ? "Not Loaded" : name;
 			}
 		}
 
 		MobileControlDdvc01DeviceBridge SourceBridge;
 
-		SIMPLAtcMessenger AtcMessenger;
-		SIMPLVtcMessenger VtcMessenger;
+		Ddvc01AtcMessenger AtcMessenger;
+		Ddvc01VtcMessenger VtcMessenger;
 
 
 		/// <summary>
@@ -55,7 +248,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 		/// <param name="key"></param>
 		/// <param name="name"></param>
 		/// <param name="ipId"></param>
-		public MobileControlSIMPLRoomBridge(string key, string name, uint ipId)
+		public MobileControlDdvc01RoomBridge(string key, string name, uint ipId)
 			: base(key, name)
 		{
 			try
@@ -65,13 +258,8 @@ namespace PepperDash.Essentials.Room.MobileControl
 				if (reg != Crestron.SimplSharpPro.eDeviceRegistrationUnRegistrationResponse.Success)
 					Debug.Console(0, this, "Cannot connect EISC at IPID {0}: \r{1}", ipId, reg);
 
-                JoinMap = new MobileControlSIMPLRoomJoinMap(1);
-
 				SourceBridge = new MobileControlDdvc01DeviceBridge(key + "-sourceBridge", "DDVC01 source bridge", EISC);
 				DeviceManager.AddDevice(SourceBridge);
-
-
-                
 			}
 			catch (Exception)
 			{
@@ -91,33 +279,24 @@ namespace PepperDash.Essentials.Room.MobileControl
 			SetupFeedbacks();
 
             var atcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			AtcMessenger = new SIMPLAtcMessenger(atcKey, EISC, "/device/audioCodec");
+			AtcMessenger = new Ddvc01AtcMessenger(atcKey, EISC, "/device/audioCodec");
 			AtcMessenger.RegisterWithAppServer(Parent);
 
             var vtcKey = string.Format("atc-{0}-{1}", this.Key, Parent.Key);
-			VtcMessenger = new SIMPLVtcMessenger(vtcKey, EISC, "/device/videoCodec");
+			VtcMessenger = new Ddvc01VtcMessenger(vtcKey, EISC, "/device/videoCodec");
 			VtcMessenger.RegisterWithAppServer(Parent);
 
 			EISC.SigChange += EISC_SigChange;
 			EISC.OnlineStatusChange += (o, a) =>
 			{
-				Debug.Console(1, this, "DDVC EISC online={0}. Config is ready={1}. Use Essentials Config={2}",
-                    a.DeviceOnLine, EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue, EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue);
-
-				if (a.DeviceOnLine && EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue)
+				Debug.Console(1, this, "DDVC EISC online={0}. Config is ready={1}", a.DeviceOnLine, EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue);
+				if (a.DeviceOnLine && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue)
 					LoadConfigValues();
-
-                if (a.DeviceOnLine && EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue)
-                    UseEssentialsConfig();
 			};
 			// load config if it's already there
-			if (EISC.IsOnline && EISC.BooleanOutput[JoinMap.ConfigIsReady.JoinNumber].BoolValue) // || EISC.BooleanInput[JoinMap.ConfigIsReady].BoolValue)
+			if (EISC.IsOnline && EISC.BooleanOutput[BoolJoin.ConfigIsReady].BoolValue) // || EISC.BooleanInput[BoolJoin.ConfigIsReady].BoolValue)
 				LoadConfigValues();
 
-            if (EISC.IsOnline && EISC.BooleanOutput[JoinMap.ConfigIsLocal.JoinNumber].BoolValue)
-            {
-                UseEssentialsConfig();
-            }
 
 			CrestronConsole.AddNewConsoleCommand(s =>
 			{
@@ -144,60 +323,41 @@ namespace PepperDash.Essentials.Room.MobileControl
 			return base.CustomActivate();
 		}
 
-        void UseEssentialsConfig()
-        {
-            ConfigIsLoaded = false;
-
-            SetupDeviceMessengers();
-
-            Debug.Console(0, this, "******* ESSENTIALS CONFIG: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
-
-            var handler = ConfigurationIsReady;
-            if (handler != null)
-            {
-                handler(this, new EventArgs());
-            }
-
-            ConfigIsLoaded = true;
-        }
 
 		/// <summary>
 		/// Setup the actions to take place on various incoming API calls
 		/// </summary>
 		void SetupFunctions()
 		{
-			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(JoinMap.PromptForCode.JoinNumber)));
-			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(JoinMap.ClientJoined.JoinNumber)));
+			Parent.AddAction(@"/room/room1/promptForCode", new Action(() => EISC.PulseBool(BoolJoin.PromptForCode)));
+			Parent.AddAction(@"/room/room1/clientJoined", new Action(() => EISC.PulseBool(BoolJoin.ClientJoined)));
 
 			Parent.AddAction(@"/room/room1/status", new Action(SendFullStatus));
 
 			Parent.AddAction(@"/room/room1/source", new Action<SourceSelectMessageContent>(c =>
 			{
-				EISC.SetString(JoinMap.CurrentSourceKey.JoinNumber, c.SourceListItem);
-				EISC.PulseBool(JoinMap.SourceHasChanged.JoinNumber);
+				EISC.SetString(StringJoin.SelectedSourceKey, c.SourceListItem);
+				EISC.PulseBool(BoolJoin.SourceHasChanged);
 			}));
 
 			Parent.AddAction(@"/room/room1/defaultsource", new Action(() => 
-				EISC.PulseBool(JoinMap.ActivityShare.JoinNumber)));
+				EISC.PulseBool(BoolJoin.ActivityShare)));
 			Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
-				EISC.PulseBool(JoinMap.ActivityPhoneCall.JoinNumber)));
+				EISC.PulseBool(BoolJoin.ActivityPhoneCall)));
 			Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
-				EISC.PulseBool(JoinMap.ActivityVideoCall.JoinNumber)));
+				EISC.PulseBool(BoolJoin.ActivityVideoCall)));
 
 			Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u => 
-				EISC.SetUshort(JoinMap.MasterVolume.JoinNumber, u)));
+				EISC.SetUshort(UshortJoin.MasterVolumeLevel, u)));
 			Parent.AddAction(@"/room/room1/volumes/master/muteToggle", new Action(() => 
-				EISC.PulseBool(JoinMap.MasterVolume.JoinNumber)));
+				EISC.PulseBool(BoolJoin.MasterVolumeIsMuted)));
 			Parent.AddAction(@"/room/room1/volumes/master/privacyMuteToggle", new Action(() =>
-				EISC.PulseBool(JoinMap.PrivacyMute.JoinNumber)));
+				EISC.PulseBool(BoolJoin.PrivacyMute)));
 
 
 			// /xyzxyz/volumes/master/muteToggle ---> BoolInput[1]
 
-            var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
-            var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
-
-            for (uint i = volumeStart; i <= volumeEnd; i++)
+			for (uint i = 2; i <= 7; i++)
 			{
 				var index = i;
 				Parent.AddAction(string.Format(@"/room/room1/volumes/level-{0}/level", index), new Action<ushort>(u =>
@@ -207,16 +367,13 @@ namespace PepperDash.Essentials.Room.MobileControl
 			}
 
 			Parent.AddAction(@"/room/room1/shutdownStart", new Action(() =>
-				EISC.PulseBool(JoinMap.ShutdownStart.JoinNumber)));
+				EISC.PulseBool(BoolJoin.ShutdownStart)));
 			Parent.AddAction(@"/room/room1/shutdownEnd", new Action(() =>
-				EISC.PulseBool(JoinMap.ShutdownEnd.JoinNumber)));
+				EISC.PulseBool(BoolJoin.ShutdownEnd)));
 			Parent.AddAction(@"/room/room1/shutdownCancel", new Action(() =>
-				EISC.PulseBool(JoinMap.ShutdownCancel.JoinNumber)));
+				EISC.PulseBool(BoolJoin.ShutdownCancel)));
 		}
 
-
-
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -241,21 +398,21 @@ namespace PepperDash.Essentials.Room.MobileControl
 		void SetupFeedbacks()
 		{
 			// Power 
-			EISC.SetBoolSigAction(JoinMap.RoomIsOn.JoinNumber, b =>
+			EISC.SetBoolSigAction(BoolJoin.RoomIsOn, b =>
 				PostStatusMessage(new
 					{
 						isOn = b
 					}));
 
 			// Source change things
-			EISC.SetSigTrueAction(JoinMap.SourceHasChanged.JoinNumber, () =>
+			EISC.SetSigTrueAction(BoolJoin.SourceHasChanged, () =>
 				PostStatusMessage(new
 					{
-						selectedSourceKey = EISC.StringOutput[JoinMap.CurrentSourceKey.JoinNumber].StringValue
+						selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue
 					}));
 
 			// Volume things
-			EISC.SetUShortSigAction(JoinMap.MasterVolume.JoinNumber, u =>
+			EISC.SetUShortSigAction(UshortJoin.MasterVolumeLevel, u =>
                 PostStatusMessage(new
                 {
                     volumes = new
@@ -270,7 +427,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 			// map MasterVolumeIsMuted join -> status/volumes/master/muted
 			// 
 
-			EISC.SetBoolSigAction(JoinMap.MasterVolume.JoinNumber, b =>
+			EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b =>
                 PostStatusMessage(new
                 {
                     volumes = new
@@ -281,7 +438,7 @@ namespace PepperDash.Essentials.Room.MobileControl
                         }
                     }
                 }));
-			EISC.SetBoolSigAction(JoinMap.PrivacyMute.JoinNumber, b => 
+			EISC.SetBoolSigAction(BoolJoin.PrivacyMute, b => 
 				PostStatusMessage(new
 				{
 					volumes = new 
@@ -293,10 +450,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 					}
 				}));
 
-            var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
-            var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
-
-            for (uint i = volumeStart; i <= volumeEnd; i++)
+			for (uint i = 2; i <= 7; i++)
 			{
 				var index = i; // local scope for lambdas
 				EISC.SetUShortSigAction(index, u => // start at join 2
@@ -327,7 +481,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 				});
 			}
 
-			EISC.SetUShortSigAction(JoinMap.NumberOfAuxFaders.JoinNumber, u => 
+			EISC.SetUShortSigAction(UshortJoin.NumberOfAuxFaders, u => 
 				PostStatusMessage(new {
 					volumes = new {
 						numberOfAuxFaders = u,
@@ -335,30 +489,30 @@ namespace PepperDash.Essentials.Room.MobileControl
 				}));
 
 			// shutdown things
-			EISC.SetSigTrueAction(JoinMap.ShutdownCancel.JoinNumber, new Action(() =>
+			EISC.SetSigTrueAction(BoolJoin.ShutdownCancel, new Action(() =>
 				PostMessage("/room/shutdown/", new
 				{
 					state = "wasCancelled"
 				})));
-			EISC.SetSigTrueAction(JoinMap.ShutdownEnd.JoinNumber, new Action(() =>
+			EISC.SetSigTrueAction(BoolJoin.ShutdownEnd, new Action(() =>
 				PostMessage("/room/shutdown/", new
 				{
 					state = "hasFinished"
 				})));
-			EISC.SetSigTrueAction(JoinMap.ShutdownStart.JoinNumber, new Action(() =>
+			EISC.SetSigTrueAction(BoolJoin.ShutdownStart, new Action(() =>
 				PostMessage("/room/shutdown/", new
 				{
 					state = "hasStarted",
-					duration = EISC.UShortOutput[JoinMap.ShutdownPromptDuration.JoinNumber].UShortValue
+					duration = EISC.UShortOutput[UshortJoin.ShutdownPromptDuration].UShortValue
 				})));
 
 			// Config things
-			EISC.SetSigTrueAction(JoinMap.ConfigIsReady.JoinNumber, LoadConfigValues);
+			EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
 
 			// Activity modes
-			EISC.SetSigTrueAction(JoinMap.ActivityShare.JoinNumber, () => UpdateActivity(1));
-			EISC.SetSigTrueAction(JoinMap.ActivityPhoneCall.JoinNumber, () => UpdateActivity(2));
-			EISC.SetSigTrueAction(JoinMap.ActivityVideoCall.JoinNumber, () => UpdateActivity(3));
+			EISC.SetSigTrueAction(BoolJoin.ActivityShare, () => UpdateActivity(1));
+			EISC.SetSigTrueAction(BoolJoin.ActivityPhoneCall, () => UpdateActivity(2));
+			EISC.SetSigTrueAction(BoolJoin.ActivityVideoCall, () => UpdateActivity(3));
 		}
 
 
@@ -402,7 +556,7 @@ namespace PepperDash.Essentials.Room.MobileControl
                 Debug.Console(0, this, "Replacing Room[0] in config");
                 co.Rooms[0] = rm;
             }
-			rm.Name = EISC.StringOutput[JoinMap.ConfigRoomName.JoinNumber].StringValue;
+			rm.Name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue;
 			rm.Key = "room1";
 			rm.Type = "ddvc01";
 
@@ -413,13 +567,13 @@ namespace PepperDash.Essentials.Room.MobileControl
 				rmProps = JsonConvert.DeserializeObject<DDVC01RoomPropertiesConfig>(rm.Properties.ToString());
 
 			rmProps.Help = new EssentialsHelpPropertiesConfig();
-			rmProps.Help.CallButtonText = EISC.StringOutput[JoinMap.ConfigHelpNumber.JoinNumber].StringValue;
-			rmProps.Help.Message = EISC.StringOutput[JoinMap.ConfigHelpMessage.JoinNumber].StringValue;
+			rmProps.Help.CallButtonText = EISC.StringOutput[StringJoin.ConfigHelpNumber].StringValue;
+			rmProps.Help.Message = EISC.StringOutput[StringJoin.ConfigHelpMessage].StringValue;
 
 			rmProps.Environment = new EssentialsEnvironmentPropertiesConfig(); // enabled defaults to false
 
-			rmProps.RoomPhoneNumber = EISC.StringOutput[JoinMap.ConfigRoomPhoneNumber.JoinNumber].StringValue;
-			rmProps.RoomURI = EISC.StringOutput[JoinMap.ConfigRoomURI.JoinNumber].StringValue;
+			rmProps.RoomPhoneNumber = EISC.StringOutput[StringJoin.ConfigRoomPhoneNumber].StringValue;
+			rmProps.RoomURI = EISC.StringOutput[StringJoin.ConfigRoomURI].StringValue;
 			rmProps.SpeedDials = new List<DDVC01SpeedDial>();
 
 			// This MAY need a check 
@@ -427,7 +581,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 			rmProps.VideoCodecKey = "videoCodec";
 
 			// volume control names
-			var volCount = EISC.UShortOutput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
+			var volCount = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
 
             //// use Volumes object or?
             //rmProps.VolumeSliderNames = new List<string>();
@@ -472,18 +626,18 @@ namespace PepperDash.Essentials.Room.MobileControl
 			// add sources...
 			for (uint i = 0; i <= 19; i++)
 			{
-				var name = EISC.StringOutput[JoinMap.SourceNameJoinStart.JoinNumber + i].StringValue;
-				if (EISC.BooleanOutput[JoinMap.UseSourceEnabled.JoinNumber].BoolValue
-					&& !EISC.BooleanOutput[JoinMap.SourceIsEnabledJoinStart.JoinNumber + i].BoolValue)
+				var name = EISC.StringOutput[StringJoin.SourceNameJoinStart + i].StringValue;
+				if (EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue
+					&& !EISC.BooleanOutput[BoolJoin.SourceIsEnabledJoinStart + i].BoolValue)
 				{
 					continue;
 				}		
-				else if(!EISC.BooleanOutput[JoinMap.UseSourceEnabled.JoinNumber].BoolValue && string.IsNullOrEmpty(name))
+				else if(!EISC.BooleanOutput[BoolJoin.UseSourceEnabled].BoolValue && string.IsNullOrEmpty(name))
 					break;
-				var icon = EISC.StringOutput[JoinMap.SourceIconJoinStart.JoinNumber + i].StringValue;
-				var key = EISC.StringOutput[JoinMap.SourceKeyJoinStart.JoinNumber + i].StringValue;
-				var type = EISC.StringOutput[JoinMap.SourceTypeJoinStart.JoinNumber + i].StringValue;
-				var disableShare = EISC.BooleanOutput[JoinMap.SourceShareDisableJoinStart.JoinNumber + i].BoolValue;
+				var icon = EISC.StringOutput[StringJoin.SourceIconJoinStart + i].StringValue;
+				var key = EISC.StringOutput[StringJoin.SourceKeyJoinStart + i].StringValue;
+				var type = EISC.StringOutput[StringJoin.SourceTypeJoinStart + i].StringValue;
+				var disableShare = EISC.BooleanOutput[BoolJoin.SourceShareDisableJoinStart + i].BoolValue;
 
 				Debug.Console(0, this, "Adding source {0} '{1}'", key, name);
 				var newSLI = new SourceListItem{
@@ -525,14 +679,14 @@ namespace PepperDash.Essentials.Room.MobileControl
 				var acFavs = new List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
 				for (uint i = 0; i < 4; i++)
 				{
-					if (!EISC.GetBool(JoinMap.SpeedDialVisibleStartJoin.JoinNumber + i))
+					if (!EISC.GetBool(BoolJoin.SpeedDialVisibleStartJoin + i))
 					{
 						break;
 					}
 					acFavs.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem()
 					{
-						Name = EISC.GetString(JoinMap.SpeedDialNameStartJoin.JoinNumber + i),
-						Number = EISC.GetString(JoinMap.SpeedDialNumberStartJoin.JoinNumber + i),
+						Name = EISC.GetString(StringJoin.SpeedDialNameStartJoin + i),
+						Number = EISC.GetString(StringJoin.SpeedDialNumberStartJoin + i),
 						Type = PepperDash.Essentials.Devices.Common.Codec.eCodecCallType.Audio
 					});
 				}
@@ -564,7 +718,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 				var camsProps = new List<object>();
 				for (uint i = 0; i < 9; i++)
 				{
-					var name = EISC.GetString(i + JoinMap.CameraNearNameStart.JoinNumber);
+					var name = EISC.GetString(i + StringJoin.CameraNearNameStart);
 					if (!string.IsNullOrEmpty(name))
 					{
 						camsProps.Add(new
@@ -574,7 +728,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 						});
 					}
 				}
-				var farName = EISC.GetString(JoinMap.CameraFarName.JoinNumber);
+				var farName = EISC.GetString(StringJoin.CameraFarName);
 				if (!string.IsNullOrEmpty(farName))
 				{
 					camsProps.Add(new
@@ -601,8 +755,6 @@ namespace PepperDash.Essentials.Room.MobileControl
 				co.Devices.Add(conf);
 			}
 
-            SetupDeviceMessengers();
-
 			Debug.Console(0, this, "******* CONFIG FROM DDVC: \r{0}", JsonConvert.SerializeObject(ConfigReader.ConfigObject, Formatting.Indented));
 
 			var handler = ConfigurationIsReady;
@@ -614,67 +766,6 @@ namespace PepperDash.Essentials.Room.MobileControl
 			ConfigIsLoaded = true;
 		}
 
-        /// <summary>
-        /// Iterates device config and adds messengers as neede for each device type
-        /// </summary>
-        void SetupDeviceMessengers()
-        {
-            try
-            {
-                foreach (var device in ConfigReader.ConfigObject.Devices)
-                {
-                    if (device.Group.Equals("simplmessenger"))
-                    {
-                        var props = JsonConvert.DeserializeObject<SimplMessengerPropertiesConfig>(device.Properties.ToString());
-
-                        var messengerKey = string.Format("device-{0}-{1}", this.Key, Parent.Key);
-
-                        if (DeviceManager.GetDeviceForKey(messengerKey) != null)
-                        {
-                            Debug.Console(2, this, "Messenger with key: {0} already exists. Skipping...", messengerKey);
-                            continue;
-                        }
-
-                        var dev = ConfigReader.ConfigObject.GetDeviceForKey(props.DeviceKey);
-
-                        if (dev == null)
-                        {
-                            Debug.Console(1, this, "Unable to find device config for key: '{0}'", props.DeviceKey);
-                            continue;
-                        }
-
-                        var type = device.Type.ToLower();
-                        MessengerBase messenger = null;
-
-                        if (type.Equals("simplcameramessenger"))
-                        {
-                            Debug.Console(2, this, "Adding SIMPLCameraMessenger for: '{0}'", props.DeviceKey);
-                            messenger = new SIMPLCameraMessenger(messengerKey, EISC, "/device/" + props.DeviceKey, props.JoinStart);
-                        }
-                        else if (type.Equals("simplroutemessenger"))
-                        {
-                            Debug.Console(2, this, "Adding SIMPLRouteMessenger for: '{0}'", props.DeviceKey);
-                            messenger = new SIMPLRouteMessenger(messengerKey, EISC, "/device/" + props.DeviceKey, props.JoinStart);
-                        }
-
-                        if (messenger != null)
-                        {
-                            DeviceManager.AddDevice(messenger);
-                            messenger.RegisterWithAppServer(Parent);
-                        }
-                        else
-                        {
-                            Debug.Console(2, this, "Unable to add messenger for device: '{0}' of type: '{1}'", props.DeviceKey, type);
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(2, this, "Error Setting up Device Managers: {0}", e);
-            }
-        }
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -682,7 +773,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 		{
 			if (ConfigIsLoaded)
 			{
-                var count = EISC.UShortOutput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
+                var count = EISC.UShortOutput[UshortJoin.NumberOfAuxFaders].UShortValue;
 
                 Debug.Console(1, this, "The Fader Count is : {0}", count);
 
@@ -690,11 +781,7 @@ namespace PepperDash.Essentials.Room.MobileControl
 
                 // Create auxFaders
 				var auxFaderDict = new Dictionary<string, Volume>();
-
-                var volumeStart = JoinMap.VolumeJoinStart.JoinNumber;
-                var volumeEnd = JoinMap.VolumeJoinStart.JoinNumber + JoinMap.VolumeJoinStart.JoinSpan;
-
-                for (uint i = volumeStart; i <= count; i++)
+				for (uint i = 2; i <= count; i++)
 				{
 					auxFaderDict.Add("level-" + i,
 						new Volume("level-" + i,
@@ -708,22 +795,22 @@ namespace PepperDash.Essentials.Room.MobileControl
                 var volumes = new Volumes();
 
                 volumes.Master = new Volume("master", 
-                                EISC.UShortOutput[JoinMap.MasterVolume.JoinNumber].UShortValue,
-                                EISC.BooleanOutput[JoinMap.MasterVolume.JoinNumber].BoolValue,
-                  				EISC.StringOutput[JoinMap.MasterVolume.JoinNumber].StringValue,
+                                EISC.UShortOutput[UshortJoin.MasterVolumeLevel].UShortValue,
+                                EISC.BooleanOutput[BoolJoin.MasterVolumeIsMuted].BoolValue,
+                  				EISC.StringOutput[1].StringValue,
 				                true,
 				                "something.png");
 				volumes.Master.HasPrivacyMute = true;
-				volumes.Master.PrivacyMuted = EISC.BooleanOutput[JoinMap.PrivacyMute.JoinNumber].BoolValue;
+				volumes.Master.PrivacyMuted = EISC.BooleanOutput[BoolJoin.PrivacyMute].BoolValue;
 
                 volumes.AuxFaders = auxFaderDict;
-				volumes.NumberOfAuxFaders = EISC.UShortInput[JoinMap.NumberOfAuxFaders.JoinNumber].UShortValue;
+				volumes.NumberOfAuxFaders = EISC.UShortInput[UshortJoin.NumberOfAuxFaders].UShortValue;
 
                 PostStatusMessage(new
                     {
 						activityMode = GetActivityMode(),
-                        isOn = EISC.BooleanOutput[JoinMap.RoomIsOn.JoinNumber].BoolValue,
-                        selectedSourceKey = EISC.StringOutput[JoinMap.CurrentSourceKey.JoinNumber].StringValue,
+                        isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue,
+                        selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue,
                         volumes = volumes
                     });			
 			}
@@ -742,9 +829,9 @@ namespace PepperDash.Essentials.Room.MobileControl
 		/// <returns></returns>
 		int GetActivityMode()
 		{
-			if (EISC.BooleanOutput[JoinMap.ActivityPhoneCall.JoinNumber].BoolValue) return 2;
-			else if (EISC.BooleanOutput[JoinMap.ActivityShare.JoinNumber].BoolValue) return 1;
-			else if (EISC.BooleanOutput[JoinMap.ActivityVideoCall.JoinNumber].BoolValue) return 3;
+			if (EISC.BooleanOutput[BoolJoin.ActivityPhoneCall].BoolValue) return 2;
+			else if (EISC.BooleanOutput[BoolJoin.ActivityShare].BoolValue) return 1;
+			else if (EISC.BooleanOutput[BoolJoin.ActivityVideoCall].BoolValue) return 3;
 			return 0;
 		}
 
@@ -786,15 +873,12 @@ namespace PepperDash.Essentials.Room.MobileControl
 			if (Debug.Level >= 1)
 				Debug.Console(1, this, "DDVC EISC change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
 			var uo = args.Sig.UserObject;
-            if (uo != null)
-            {
-                if (uo is Action<bool>)
-                    (uo as Action<bool>)(args.Sig.BoolValue);
-                else if (uo is Action<ushort>)
-                    (uo as Action<ushort>)(args.Sig.UShortValue);
-                else if (uo is Action<string>)
-                    (uo as Action<string>)(args.Sig.StringValue);
-            }
+			if (uo is Action<bool>)
+				(uo as Action<bool>)(args.Sig.BoolValue);
+			else if (uo is Action<ushort>)
+				(uo as Action<ushort>)(args.Sig.UShortValue);
+			else if (uo is Action<string>)
+				(uo as Action<string>)(args.Sig.StringValue);
 		}
 
 		/// <summary>
@@ -821,8 +905,8 @@ namespace PepperDash.Essentials.Room.MobileControl
 		protected override void UserCodeChange()
 		{
 			Debug.Console(1, this, "Server user code changed: {0}", UserCode);
-			EISC.StringInput[JoinMap.UserCodeToSystem.JoinNumber].StringValue = UserCode;
-			EISC.StringInput[JoinMap.ServerUrl.JoinNumber].StringValue = Parent.Config.ClientAppUrl;
+			EISC.StringInput[StringJoin.UserCodeToSystem].StringValue = UserCode;
+			EISC.StringInput[StringJoin.ServerUrl].StringValue = Parent.Config.ClientAppUrl;
 		}
 	}
 }

PepperDashEssentials/AppServer/RoomBridges/MobileControlEssentialsHuddleSpaceRoomBridge.cs

@@ -25,8 +25,6 @@ namespace PepperDash.Essentials
 
         public AudioCodecBaseMessenger ACMessenger { get; private set; }
 
-        public Dictionary<string, MessengerBase> DeviceMessengers { get; private set; }
-
 
 		/// <summary>
 		/// 
@@ -69,15 +67,7 @@ namespace PepperDash.Essentials
 			var routeRoom = Room as IRunRouteAction;
 			if(routeRoom != null)
 				Parent.AddAction(string.Format(@"/room/{0}/source", Room.Key), new Action<SourceSelectMessageContent>(c => 
-                    {
-                        if(string.IsNullOrEmpty(c.SourceListKey))
-                            routeRoom.RunRouteAction(c.SourceListItem, Room.SourceListKey);
-                        else
-                        {
-                            routeRoom.RunRouteAction(c.SourceListItem, c.SourceListKey);
-                        }
-                    }));
-
+					routeRoom.RunRouteAction(c.SourceListItem)));
 
 			var defaultRoom = Room as IRunDefaultPresentRoute;
 			if(defaultRoom != null)
@@ -125,8 +115,6 @@ namespace PepperDash.Essentials
                 ACMessenger.RegisterWithAppServer(Parent);
             }
 
-            SetupDeviceMessengers();
-
 			var defCallRm = Room as IRunDefaultCallRoute;
 			if (defCallRm != null)
 			{
@@ -146,36 +134,6 @@ namespace PepperDash.Essentials
 			Room.ShutdownPromptTimer.WasCancelled += ShutdownPromptTimer_WasCancelled;
 		}
 
-        /// <summary>
-        /// Set up the messengers for each device type
-        /// </summary>
-        void SetupDeviceMessengers()
-        {
-            DeviceMessengers = new Dictionary<string,MessengerBase>();
-
-            foreach (var device in DeviceManager.AllDevices)
-            {
-                Debug.Console(2, this, "Attempting to set up device messenger for device: {0}", device.Key);
-
-                if (device is Essentials.Devices.Common.Cameras.CameraBase)
-                {
-                    var camDevice = device as Essentials.Devices.Common.Cameras.CameraBase;
-                    Debug.Console(2, this, "Adding CameraBaseMessenger for device: {0}", device.Key);
-                    var cameraMessenger = new CameraBaseMessenger(device.Key + "-" + Parent.Key, camDevice, "/device/" + device.Key);
-                    DeviceMessengers.Add(device.Key, cameraMessenger);
-                    cameraMessenger.RegisterWithAppServer(Parent);
-                }
-                if (device is Essentials.Devices.Common.SoftCodec.BlueJeansPc)
-                {
-                    var softCodecDevice = device as Essentials.Devices.Common.SoftCodec.BlueJeansPc;
-                    Debug.Console(2, this, "Adding IRunRouteActionMessnger for device: {0}", device.Key);
-                    var routeMessenger = new IRunRouteActionMessenger(device.Key + "-" + Parent.Key, softCodecDevice, "/device/" + device.Key);
-                    DeviceMessengers.Add(device.Key, routeMessenger);
-                    routeMessenger.RegisterWithAppServer(Parent);
-                }
-            }
-        }
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -472,7 +430,6 @@ namespace PepperDash.Essentials
     public class SourceSelectMessageContent
     {
 		public string SourceListItem { get; set; }
-        public string SourceListKey { get; set; }
     }
 
 	/// <summary>

PepperDashEssentials/AppServer/SIMPLJoinMaps/MobileControlSIMPLRoomJoinMap.cs

@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer
-{
-    public class MobileControlSIMPLRoomJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("MasterVolume")]
-        public JoinDataComplete MasterVolume = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() {Label = "Master Volume Mute Toggle/FB/Level/Label", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalogSerial });
-        [JoinName("VolumeJoinStart")]
-        public JoinDataComplete VolumeJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 8 }, new JoinMetadata() {Label = "Volume Mute Toggle/FB/Level/Label", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalogSerial });
-
-        [JoinName("PrivacyMute")]
-        public JoinDataComplete PrivacyMute = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "Privacy Mute Toggle/FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("PromptForCode")]
-        public JoinDataComplete PromptForCode = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 1 }, new JoinMetadata() {Label = "Prompt User for Code", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ClientJoined")]
-        public JoinDataComplete ClientJoined = new JoinDataComplete(new JoinData() { JoinNumber = 42, JoinSpan = 1 }, new JoinMetadata() { Label = "Client Joined", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ActivityShare")]
-        public JoinDataComplete ActivityShare = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() {Label = "Activity Share", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ActivityPhoneCall")]
-        public JoinDataComplete ActivityPhoneCall = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Activity Phone Call", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ActivityVideoCall")]
-        public JoinDataComplete ActivityVideoCall = new JoinDataComplete(new JoinData() { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata() { Label = "Activity Video Call", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("ShutdownPromptDuration")]
-        public JoinDataComplete ShutdownPromptDuration = new JoinDataComplete(new JoinData() { JoinNumber = 61, JoinSpan = 1 }, new JoinMetadata() { Label ="Shutdown Cancel", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        [JoinName("ShutdownCancel")]
-        public JoinDataComplete ShutdownCancel = new JoinDataComplete(new JoinData() { JoinNumber = 61, JoinSpan = 1 }, new JoinMetadata() { Label ="Shutdown Cancel", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ShutdownEnd")]
-        public JoinDataComplete ShutdownEnd = new JoinDataComplete(new JoinData() { JoinNumber = 62, JoinSpan = 1 }, new JoinMetadata() { Label = "Shutdown End", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ShutdownStart")]
-        public JoinDataComplete ShutdownStart = new JoinDataComplete(new JoinData() { JoinNumber = 63, JoinSpan = 1 }, new JoinMetadata() { Label = "Shutdown Start", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceHasChanged")]
-        public JoinDataComplete SourceHasChanged = new JoinDataComplete(new JoinData() { JoinNumber = 71, JoinSpan = 1 }, new JoinMetadata() { Label = "Source Changed", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CurrentSourceKey")]
-        public JoinDataComplete CurrentSourceKey = new JoinDataComplete(new JoinData() { JoinNumber = 71, JoinSpan = 1 }, new JoinMetadata() { Label = "Key of selected source", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Serial });
-
-
-        [JoinName("ConfigIsLocal")]
-        public JoinDataComplete ConfigIsLocal = new JoinDataComplete(new JoinData() { JoinNumber = 100, JoinSpan = 1 }, new JoinMetadata() { Label = "Config is local to Essentials", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("NumberOfAuxFaders")]
-        public JoinDataComplete NumberOfAuxFaders = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Number of Auxilliary Faders", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("SpeedDialNameStartJoin")]
-        public JoinDataComplete SpeedDialNameStartJoin = new JoinDataComplete(new JoinData() { JoinNumber = 241, JoinSpan = 10 }, new JoinMetadata() { Label = "Speed Dial names", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SpeedDialNumberStartJoin")]
-        public JoinDataComplete SpeedDialNumberStartJoin = new JoinDataComplete(new JoinData() { JoinNumber = 251, JoinSpan = 10 }, new JoinMetadata() { Label = "Speed Dial numbers", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("SpeedDialVisibleStartJoin")]
-        public JoinDataComplete SpeedDialVisibleStartJoin = new JoinDataComplete(new JoinData() { JoinNumber = 261, JoinSpan = 10 }, new JoinMetadata() { Label =  "Speed Dial Visible", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-      
-        [JoinName("RoomIsOn")]
-        public JoinDataComplete RoomIsOn = new JoinDataComplete(new JoinData() { JoinNumber = 301, JoinSpan = 1 }, new JoinMetadata() { Label = "Room Is On", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("UserCodeToSystem")]
-        public JoinDataComplete UserCodeToSystem = new JoinDataComplete(new JoinData() { JoinNumber = 401, JoinSpan = 1 }, new JoinMetadata() { Label = "User Ccde", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ServerUrl")]
-        public JoinDataComplete ServerUrl = new JoinDataComplete(new JoinData() { JoinNumber = 402, JoinSpan = 1 }, new JoinMetadata() { Label ="Server URL", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        [JoinName("ConfigRoomName")]
-        public JoinDataComplete ConfigRoomName = new JoinDataComplete(new JoinData() { JoinNumber = 501, JoinSpan = 1 }, new JoinMetadata() {Label = "Room Nnme", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigHelpMessage")]
-        public JoinDataComplete ConfigHelpMessage = new JoinDataComplete(new JoinData() { JoinNumber = 502, JoinSpan = 1 }, new JoinMetadata() { Label = "Room help message", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigHelpNumber")]
-        public JoinDataComplete ConfigHelpNumber = new JoinDataComplete(new JoinData() { JoinNumber = 503, JoinSpan = 1 }, new JoinMetadata() {  Label = "Room help number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigRoomPhoneNumber")]
-        public JoinDataComplete ConfigRoomPhoneNumber = new JoinDataComplete(new JoinData() { JoinNumber = 504, JoinSpan = 1 }, new JoinMetadata() { Label = "Room phone number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("ConfigRoomURI")]
-        public JoinDataComplete ConfigRoomURI = new JoinDataComplete(new JoinData() { JoinNumber = 505, JoinSpan = 1 }, new JoinMetadata() {  Label = "Room URI", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("ConfigIsReady")]
-        public JoinDataComplete ConfigIsReady = new JoinDataComplete(new JoinData() { JoinNumber = 501, JoinSpan = 1 }, new JoinMetadata() { Label =  "Config info from SIMPL is ready", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("HideVideoConfRecents")]
-        public JoinDataComplete HideVideoConfRecents = new JoinDataComplete(new JoinData() { JoinNumber = 502, JoinSpan = 1 }, new JoinMetadata() { Label = "Hide Video Conference Recents", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ShowCameraWhenNotInCall")]
-        public JoinDataComplete ShowCameraWhenNotInCall = new JoinDataComplete(new JoinData() { JoinNumber = 503, JoinSpan = 1 }, new JoinMetadata() { Label = "Show camera when not in call", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("UseSourceEnabled")]
-        public JoinDataComplete UseSourceEnabled = new JoinDataComplete(new JoinData() { JoinNumber = 504, JoinSpan = 1 }, new JoinMetadata() { Label = "Use Source Enabled Joins", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-
-        [JoinName("SourceShareDisableJoinStart")]
-        public JoinDataComplete SourceShareDisableJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 601, JoinSpan = 20 }, new JoinMetadata() { Label = "Source is not sharable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SourceIsEnabledJoinStart")]
-        public JoinDataComplete SourceIsEnabledJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 621, JoinSpan = 20 }, new JoinMetadata() { Label = "Source is enabled", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceNameJoinStart")]
-        public JoinDataComplete SourceNameJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 601, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Names", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SourceIconJoinStart")]
-        public JoinDataComplete SourceIconJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 621, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Icons", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SourceKeyJoinStart")]
-        public JoinDataComplete SourceKeyJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 641, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Keys", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("SourceTypeJoinStart")]
-        public JoinDataComplete SourceTypeJoinStart = new JoinDataComplete(new JoinData() { JoinNumber = 661, JoinSpan = 20 }, new JoinMetadata() { Label = "Source Types", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("CameraNearNameStart")]
-        public JoinDataComplete CameraNearNameStart = new JoinDataComplete(new JoinData() { JoinNumber = 761, JoinSpan = 10 }, new JoinMetadata() { Label = "Near End Camera Names", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CameraFarName")]
-        public JoinDataComplete CameraFarName = new JoinDataComplete(new JoinData() { JoinNumber = 770, JoinSpan = 1 }, new JoinMetadata() { Label = "Far End Camera Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        public MobileControlSIMPLRoomJoinMap(uint joinStart)
-            :base(joinStart)
-        {
-         
-        }
-    }
-}

PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLAtcJoinMap.cs

@@ -1,69 +0,0 @@
-using System.Linq;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer
-{
-    public class SIMPLAtcJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("EndCall")]
-        public JoinDataComplete EndCall = new JoinDataComplete(new JoinData() {  JoinNumber = 21, JoinSpan = 1 }, new JoinMetadata() { Label = "Hang Up", JoinCapabilities = eJoinCapabilities.ToSIMPL,  JoinType = eJoinType.Digital });
-        [JoinName("IncomingAnswer")]
-        public JoinDataComplete IncomingAnswer = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Answer Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingReject")]
-        public JoinDataComplete IncomingReject = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Reject Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SpeedDialStart")]
-        public JoinDataComplete SpeedDialStart = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 4 }, new JoinMetadata() { Label = "Speed Dial", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CurrentDialString")]
-        public JoinDataComplete CurrentDialString = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Dial String", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallNumber")]
-        public JoinDataComplete CurrentCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallName")]
-        public JoinDataComplete CurrentCallName = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("HookState")]
-        public JoinDataComplete HookState = new JoinDataComplete(new JoinData() { JoinNumber = 21, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Hook State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CallDirection")]
-        public JoinDataComplete CallDirection = new JoinDataComplete(new JoinData() { JoinNumber = 22, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Direction", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("IncomingCallName")]
-        public JoinDataComplete IncomingCallName = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("IncomingCallNumber")]
-        public JoinDataComplete IncomingCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("0")]
-        public JoinDataComplete Dtmf0 = new JoinDataComplete(new JoinData() { JoinNumber = 10, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 0", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("1")]
-        public JoinDataComplete Dtmf1 = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("2")]
-        public JoinDataComplete Dtmf2 = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("3")]
-        public JoinDataComplete Dtmf3 = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 3", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("4")]
-        public JoinDataComplete Dtmf4 = new JoinDataComplete(new JoinData() { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 4", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("5")]
-        public JoinDataComplete Dtmf5 = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 5", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("6")]
-        public JoinDataComplete Dtmf6 = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 6", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("7")]
-        public JoinDataComplete Dtmf7 = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 7", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("8")]
-        public JoinDataComplete Dtmf8 = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 8", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("9")]
-        public JoinDataComplete Dtmf9 = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 9", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("*")]
-        public JoinDataComplete DtmfStar = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF *", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("#")]
-        public JoinDataComplete DtmfPound = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF #", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor that passes the joinStart to the base class
-        /// </summary>
-        /// <param name="joinStart"></param>
-        public SIMPLAtcJoinMap(uint joinStart)
-            : base(joinStart)
-        {
-
-        }
-    }
-}

PepperDashEssentials/AppServer/SIMPLJoinMaps/SIMPLVtcJoinMap.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Essentials.Core;
-
-
-namespace PepperDash.Essentials.AppServer
-{
-    public class SIMPLVtcJoinMap : JoinMapBaseAdvanced
-    {
-        [JoinName("EndCall")]
-        public JoinDataComplete EndCall = new JoinDataComplete(new JoinData() { JoinNumber = 24, JoinSpan = 1 }, new JoinMetadata() { Label = "Hang Up", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingCall")]
-        public JoinDataComplete IncomingCall = new JoinDataComplete(new JoinData() { JoinNumber = 50, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingAnswer")]
-        public JoinDataComplete IncomingAnswer = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Answer Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("IncomingReject")]
-        public JoinDataComplete IncomingReject = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Reject Incoming Call", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SpeedDialStart")]
-        public JoinDataComplete SpeedDialStart = new JoinDataComplete(new JoinData() { JoinNumber = 41, JoinSpan = 4 }, new JoinMetadata() { Label = "Speed Dial", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DirectorySearchBusy")]
-        public JoinDataComplete DirectorySearchBusy = new JoinDataComplete(new JoinData() { JoinNumber = 100, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Search Busy FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryLineSelected")]
-        public JoinDataComplete DirectoryLineSelected = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Line Selected FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryEntryIsContact")]
-        public JoinDataComplete DirectoryEntryIsContact = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Selected Entry Is Contact FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryIsRoot")]
-        public JoinDataComplete DirectoryIsRoot = new JoinDataComplete(new JoinData() { JoinNumber = 102, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory is on Root FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DDirectoryHasChanged")]
-        public JoinDataComplete DDirectoryHasChanged = new JoinDataComplete(new JoinData() { JoinNumber = 103, JoinSpan = 1 }, new JoinMetadata() {Label = "Directory has changed FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryRoot")]
-        public JoinDataComplete DirectoryRoot = new JoinDataComplete(new JoinData() { JoinNumber = 104, JoinSpan = 1 }, new JoinMetadata() { Label = "Go to Directory Root", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryFolderBack")]
-        public JoinDataComplete DirectoryFolderBack = new JoinDataComplete(new JoinData() { JoinNumber = 105, JoinSpan = 1 }, new JoinMetadata() { Label = "Go back one directory level", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryDialSelectedLine")]
-        public JoinDataComplete DirectoryDialSelectedLine = new JoinDataComplete(new JoinData() { JoinNumber = 106, JoinSpan = 1 }, new JoinMetadata() { Label = "Dial selected directory line", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraTiltUp")]
-        public JoinDataComplete CameraTiltUp = new JoinDataComplete(new JoinData() { JoinNumber = 111, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Tilt Up", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraTiltDown")]
-        public JoinDataComplete CameraTiltDown = new JoinDataComplete(new JoinData() { JoinNumber = 112, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Tilt Down", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraPanLeft")]
-        public JoinDataComplete CameraPanLeft = new JoinDataComplete(new JoinData() { JoinNumber = 113, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Pan Left", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraPanRight")]
-        public JoinDataComplete CameraPanRight = new JoinDataComplete(new JoinData() { JoinNumber = 114, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Pan Right", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraZoomIn")]
-        public JoinDataComplete CameraZoomIn = new JoinDataComplete(new JoinData() { JoinNumber = 115, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Zoom In", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraZoomOut")]
-        public JoinDataComplete CameraZoomOut = new JoinDataComplete(new JoinData() { JoinNumber = 116, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Zoom Out", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        
-        [JoinName("CameraPresetStart")]
-        public JoinDataComplete CameraPresetStart = new JoinDataComplete(new JoinData() { JoinNumber = 121, JoinSpan = 5 }, new JoinMetadata() { Label = "Camera Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-         [JoinName("CameraModeAuto")]
-        public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData() { JoinNumber = 131, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeManual")]
-        public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData() { JoinNumber = 132, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeOff")]
-        public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData() { JoinNumber = 133, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraSelfView")]
-        public JoinDataComplete CameraSelfView = new JoinDataComplete(new JoinData() { JoinNumber = 141, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Self View Toggle/FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraLayout")]
-        public JoinDataComplete CameraLayout = new JoinDataComplete(new JoinData() { JoinNumber = 142, JoinSpan = 1 }, new JoinMetadata() { Label =  "Camera Layout Toggle", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraSupportsAutoMode")]
-        public JoinDataComplete CameraSupportsAutoMode = new JoinDataComplete(new JoinData() { JoinNumber = 143, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Supports Auto Mode FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraSupportsOffMode")]
-        public JoinDataComplete CameraSupportsOffMode = new JoinDataComplete(new JoinData() { JoinNumber = 144, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Supports Off Mode FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraNumberSelect")]
-        public JoinDataComplete CameraNumberSelect = new JoinDataComplete(new JoinData() { JoinNumber = 60, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Number Select/FB", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectorySelectRow")]
-        public JoinDataComplete DirectorySelectRow = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Select Row", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("DirectoryRowCount")]
-        public JoinDataComplete DirectoryRowCount = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Row Count FB", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CurrentDialString")]
-        public JoinDataComplete CurrentDialString = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Dial String", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallName")]
-        public JoinDataComplete CurrentCallName = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CurrentCallNumber")]
-        public JoinDataComplete CurrentCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("HookState")]
-        public JoinDataComplete HookState = new JoinDataComplete(new JoinData() { JoinNumber = 31, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Hook State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("CallDirection")]
-        public JoinDataComplete CallDirection = new JoinDataComplete(new JoinData() { JoinNumber = 22, JoinSpan = 1 }, new JoinMetadata() { Label = "Current Call Direction", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("IncomingCallName")]
-        public JoinDataComplete IncomingCallName = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("IncomingCallNumber")]
-        public JoinDataComplete IncomingCallNumber = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Incoming Call Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("DirectorySearchString")]
-        public JoinDataComplete DirectorySearchString = new JoinDataComplete(new JoinData() { JoinNumber = 100, JoinSpan = 1 }, new JoinMetadata() { Label = "Directory Search String", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("DirectoryEntriesStart")]
-        public JoinDataComplete DirectoryEntriesStart = new JoinDataComplete(new JoinData() { JoinNumber = 101, JoinSpan = 255 }, new JoinMetadata() { Label = "Directory Entries", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("DirectoryEntrySelectedName")]
-        public JoinDataComplete DirectoryEntrySelectedName = new JoinDataComplete(new JoinData() { JoinNumber = 356, JoinSpan = 1 }, new JoinMetadata() { Label = "Selected Directory Entry Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("DirectoryEntrySelectedNumber")]
-        public JoinDataComplete DirectoryEntrySelectedNumber = new JoinDataComplete(new JoinData() { JoinNumber = 357, JoinSpan = 1 }, new JoinMetadata() { Label = "Selected Directory Entry Number", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("DirectorySelectedFolderName")]
-        public JoinDataComplete DirectorySelectedFolderName = new JoinDataComplete(new JoinData() { JoinNumber = 358, JoinSpan = 1 }, new JoinMetadata() { Label = "Selected Directory Folder Name", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("1")]
-        public JoinDataComplete Dtmf1 = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 1", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("2")]
-        public JoinDataComplete Dtmf2 = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 2", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("3")]
-        public JoinDataComplete Dtmf3 = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 3", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("4")]
-        public JoinDataComplete Dtmf4 = new JoinDataComplete(new JoinData() { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 4", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("5")]
-        public JoinDataComplete Dtmf5 = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 5", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("6")]
-        public JoinDataComplete Dtmf6 = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 6", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("7")]
-        public JoinDataComplete Dtmf7 = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 7", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("8")]
-        public JoinDataComplete Dtmf8 = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 8", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("9")]
-        public JoinDataComplete Dtmf9 = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 9", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("0")]
-        public JoinDataComplete Dtmf0 = new JoinDataComplete(new JoinData() { JoinNumber = 10, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF 0", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("*")]
-        public JoinDataComplete DtmfStar = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF *", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("#")]
-        public JoinDataComplete DtmfPound = new JoinDataComplete(new JoinData() { JoinNumber = 12, JoinSpan = 1 }, new JoinMetadata() { Label = "DTMF #", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        public SIMPLVtcJoinMap(uint joinStart)
-            :base(joinStart)
-        {
-        }
-
-    }
-}

PepperDashEssentials/Bridges/AirMediaControllerBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
 		{
             AirMediaControllerJoinMap joinMap = new AirMediaControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<AirMediaControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/AppleTvBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             AppleTvJoinMap joinMap = new AppleTvJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if(!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<AppleTvJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/BridgeBase.cs

@@ -20,46 +20,6 @@ using PepperDash.Essentials.DM;
 
 namespace PepperDash.Essentials.Bridges
 {
-    /// <summary>
-    /// Helper methods for bridges
-    /// </summary>
-    public static class BridgeHelper
-    {
-        public static void PrintJoinMap(string command)
-        {
-            string bridgeKey = "";
-            string deviceKey = "";
-
-            var targets = command.Split(' ');
-
-            bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApi;
-
-            if (bridge == null)
-            {
-                Debug.Console(0, "Unable to find bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                deviceKey = targets[1].Trim();
-
-                if (!string.IsNullOrEmpty(deviceKey))
-                {
-                    bridge.PrintJoinMapForDevice(deviceKey);
-                    return;
-                }
-            }
-            else
-            {
-                bridge.PrintJoinMaps();
-            }
-        }
-    }
-
-
     /// <summary>
     /// Base class for all bridge class variants
     /// </summary>
@@ -85,6 +45,7 @@ namespace PepperDash.Essentials.Bridges
         {
 
         }
+
     }
 
     /// <summary>
@@ -94,15 +55,11 @@ namespace PepperDash.Essentials.Bridges
     {
         public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
 
-        protected Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
-
         public ThreeSeriesTcpIpEthernetIntersystemCommunications Eisc { get; private set; }
 
         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);
@@ -121,19 +78,11 @@ 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);
@@ -146,21 +95,19 @@ namespace PepperDash.Essentials.Bridges
                         }
                         else if (device is CameraBase)
                         {
-                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                            (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
                             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;
                         }
@@ -241,55 +188,6 @@ namespace PepperDash.Essentials.Bridges
             });
         }
 
-        /// <summary>
-        /// Adds a join map
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="joinMap"></param>
-        public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
-        {
-            if (!JoinMaps.ContainsKey(deviceKey))
-            {
-                JoinMaps.Add(deviceKey, joinMap);
-            }
-            else
-            {
-                Debug.Console(2, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
-            }
-        }
-
-        /// <summary>
-        /// Prints all the join maps on this bridge
-        /// </summary>
-        public void PrintJoinMaps()
-        {
-            Debug.Console(0, this, "Join Maps for EISC IPID: {0}", Eisc.ID.ToString("X"));
-
-            foreach (var joinMap in JoinMaps)
-            {
-                Debug.Console(0, "Join map for device '{0}':", joinMap.Key);
-                joinMap.Value.PrintJoinMapInfo();
-            }
-        }
-
-        /// <summary>
-        /// Prints the join map for a device by key
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        public void PrintJoinMapForDevice(string deviceKey)
-        {
-            var joinMap = JoinMaps[deviceKey];
-
-            if (joinMap == null)
-            {
-                Debug.Console(0, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
-                return;
-            }
-
-            Debug.Console(0, "Join map for device '{0}' on EISC '{1}':", deviceKey, this.Key); 
-            joinMap.PrintJoinMapInfo();
-        }
-
         /// <summary>
         /// Used for debugging to trigger an action based on a join number and type
         /// </summary>
@@ -386,10 +284,10 @@ namespace PepperDash.Essentials.Bridges
         public EssentialsControlPropertiesConfig Control { get; set; }
 
         [JsonProperty("devices")]
-        public List<ApiDevicePropertiesConfig> Devices { get; set; }
+        public List<ApiDevice> Devices { get; set; }
 
 
-        public class ApiDevicePropertiesConfig
+        public class ApiDevice
         {
             [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }

PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials.Bridges
         {
             var joinMap = new C2nRthsControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<C2nRthsControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/CameraControllerBridge.cs

@@ -15,31 +15,29 @@ namespace PepperDash.Essentials.Bridges
 {
     public static class CameraControllerApiExtensions
     {
-        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge)
+
+        public static void LinkToApi(this PepperDash.Essentials.Devices.Common.Cameras.CameraBase cameraDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            CameraControllerJoinMap joinMap = new CameraControllerJoinMap(joinStart);
-            
-            // Adds the join map to the bridge
-            bridge.AddJoinMap(cameraDevice.Key, joinMap);
+            CameraControllerJoinMap joinMap = new CameraControllerJoinMap();
 
-            var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
-            if (customJoins != null)
-            {
-                joinMap.SetCustomJoinData(customJoins);
-            }
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<CameraControllerJoinMap>(joinMapSerialized);
+
+            joinMap.OffsetJoinNumbers(joinStart);
 
             Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
             Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
 
             var commMonitor = cameraDevice as ICommunicationMonitor;
-            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+            commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
 
             var ptzCamera = cameraDevice as IHasCameraPtzControl;
 
             if (ptzCamera != null)
             {
-                trilist.SetBoolSigAction(joinMap.PanLeft.JoinNumber, (b) =>
+                trilist.SetBoolSigAction(joinMap.Left, (b) =>
                     {
                         if (b)
                         {
@@ -50,7 +48,7 @@ namespace PepperDash.Essentials.Bridges
                             ptzCamera.PanStop();
                         }
                     });
-                trilist.SetBoolSigAction(joinMap.PanRight.JoinNumber, (b) =>
+                trilist.SetBoolSigAction(joinMap.Right, (b) =>
                 {
                     if (b)
                     {
@@ -62,7 +60,7 @@ namespace PepperDash.Essentials.Bridges
                     }
                 });
 
-                trilist.SetBoolSigAction(joinMap.TiltUp.JoinNumber, (b) =>
+                trilist.SetBoolSigAction(joinMap.Up, (b) =>
                 {
                     if (b)
                     {
@@ -73,7 +71,7 @@ namespace PepperDash.Essentials.Bridges
                         ptzCamera.TiltStop();
                     }
                 });
-                trilist.SetBoolSigAction(joinMap.TiltDown.JoinNumber, (b) =>
+                trilist.SetBoolSigAction(joinMap.Down, (b) =>
                 {
                     if (b)
                     {
@@ -85,7 +83,7 @@ namespace PepperDash.Essentials.Bridges
                     }
                 });
 
-                trilist.SetBoolSigAction(joinMap.ZoomIn.JoinNumber, (b) =>
+                trilist.SetBoolSigAction(joinMap.ZoomIn, (b) =>
                 {
                     if (b)
                     {
@@ -97,7 +95,7 @@ namespace PepperDash.Essentials.Bridges
                     }
                 });
 
-                trilist.SetBoolSigAction(joinMap.ZoomOut.JoinNumber, (b) =>
+                trilist.SetBoolSigAction(joinMap.ZoomOut, (b) =>
                 {
                     if (b)
                     {
@@ -110,57 +108,27 @@ namespace PepperDash.Essentials.Bridges
                 });
             }
 
-            if (cameraDevice is IPower)
+            if (cameraDevice.GetType().Name.ToString().ToLower() == "cameravisca")
             {
-                var powerCamera = cameraDevice as IPower;
-                trilist.SetSigTrueAction(joinMap.PowerOn.JoinNumber, () => powerCamera.PowerOn());
-                trilist.SetSigTrueAction(joinMap.PowerOff.JoinNumber, () => powerCamera.PowerOff());
-             
-                powerCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn.JoinNumber]);
-                powerCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff.JoinNumber]);
-            }
+                var viscaCamera = cameraDevice as PepperDash.Essentials.Devices.Common.Cameras.CameraVisca;
+                trilist.SetSigTrueAction(joinMap.PowerOn, () => viscaCamera.PowerOn());
+                trilist.SetSigTrueAction(joinMap.PowerOff, () => viscaCamera.PowerOff());
 
-            if (cameraDevice is ICommunicationMonitor)
-            {
-                var monitoredCamera = cameraDevice as ICommunicationMonitor;
-                monitoredCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
-            }
+                viscaCamera.PowerIsOnFeedback.LinkInputSig(trilist.BooleanInput[joinMap.PowerOn]);
+                viscaCamera.PowerIsOnFeedback.LinkComplementInputSig(trilist.BooleanInput[joinMap.PowerOff]);
 
-            if (cameraDevice is IHasCameraPresets)
-            {
-                // Set the preset lables when they change
-                var presetsCamera = cameraDevice as IHasCameraPresets;
-                presetsCamera.PresetsListHasChanged += new EventHandler<EventArgs>((o, a) =>
-                {
-                    for (int i = 1; i <= joinMap.NumberOfPresets.JoinNumber; i++)
-                    {
-                        int tempNum = i - 1;
-
-                        string label = "" ;
-
-                        var preset = presetsCamera.Presets.FirstOrDefault(p => p.ID.Equals(i));
-
-                        if (preset != null)
-                            label = preset.Description;
-
-                        trilist.SetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum), label);
-                    }
-                });
-                
-                for (int i = 0; i < joinMap.NumberOfPresets.JoinNumber; i++)
+                viscaCamera.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline]);
+                for (int i = 0; i < joinMap.NumberOfPresets; i++)
                 {
                     int tempNum = i;
-
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallStart.JoinNumber + tempNum), () =>
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetRecallOffset + tempNum), () =>
                         {
-                            presetsCamera.PresetSelect(tempNum);
-                        });
-                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveStart.JoinNumber + tempNum), () =>
-                        {
-                            var label = trilist.GetString((ushort)(joinMap.PresetLabelStart.JoinNumber + tempNum));
-
-                            presetsCamera.PresetStore(tempNum, label);
+                            viscaCamera.RecallPreset(tempNum);
                         });
+                    trilist.SetSigTrueAction((ushort)(joinMap.PresetSaveOffset + tempNum), () =>
+                    {
+                        viscaCamera.SavePreset(tempNum);
+                    });
                 }
             }
         }

PepperDashEssentials/Bridges/DigitalLoggerBridge.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DigitalLoggerJoinMap joinMap = new DigitalLoggerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DigitalLoggerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DisplayControllerBridge.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Bridges
 
             DisplayControllerJoinMap joinMap = new DisplayControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
             
             if(!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DisplayControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmBladeChassisControllerBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges {
         public static void LinkToApi(this DmBladeChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey) {
             DmBladeChassisControllerJoinMap joinMap = new DmBladeChassisControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmBladeChassisControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmChassisControllerBridge.cs

@@ -23,7 +23,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmChassisControllerJoinMap joinMap = new DmChassisControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmChassisControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmRmcControllerBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmRmcControllerJoinMap joinMap = new DmRmcControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmRmcControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmTxControllerBridge.cs

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmTxControllerJoinMap joinMap = new DmTxControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmTxControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmpsAudioOutputControllerBridge.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmpsAudioOutputControllerJoinMap joinMap = new DmpsAudioOutputControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmpsAudioOutputControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/DmpsRoutingControllerBridge.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Bridges
         {
             DmpsRoutingControllerJoinMap joinMap = new DmpsRoutingControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<DmpsRoutingControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/GenericLightingBridge.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges
         {
             GenericLightingJoinMap joinMap = new GenericLightingJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericLightingJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/GenericRelayDeviceBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             GenericRelayControllerJoinMap joinMap = new GenericRelayControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GenericRelayControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/GlsOccupancySensorBaseControllerBridge.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Bridges
         {
             GlsOccupancySensorBaseJoinMap joinMap = new GlsOccupancySensorBaseJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<GlsOccupancySensorBaseJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/HdMdxxxCEControllerBridge.cs

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Bridges
         {
             HdMdxxxCEControllerJoinMap joinMap = new HdMdxxxCEControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<HdMdxxxCEControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/IBasicCommunicationBridge.cs

@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Bridges
         {
             IBasicCommunicationJoinMap joinMap = new IBasicCommunicationJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<IBasicCommunicationJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/IBridge.cs

@@ -7,20 +7,8 @@ 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/Bridges/IDigitalInputBridge.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Bridges
         {
             IDigitalInputJoinMap joinMap = new IDigitalInputJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<IDigitalInputJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/IRSetTopBoxBaseBridge.cs

@@ -17,7 +17,7 @@ namespace PepperDash.Essentials.Bridges
         public static void LinkToApi(this PepperDash.Essentials.Devices.Common.IRSetTopBoxBase stbDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
             SetTopBoxControllerJoinMap joinMap = new SetTopBoxControllerJoinMap();
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<SetTopBoxControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -8,57 +8,54 @@ using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
-    /// <summary>
-    /// Join map for CameraBase devices
-    /// </summary>
-    public class CameraControllerJoinMap : JoinMapBaseAdvanced
+    public class CameraControllerJoinMap : JoinMapBase
     {
-        [JoinName("TiltUp")]
-        public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData() { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata() { Label = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("TiltDown")]
-        public JoinDataComplete TiltDown = new JoinDataComplete(new JoinData() { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata() { Label = "Tilt Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PanLeft")]
-        public JoinDataComplete PanLeft = new JoinDataComplete(new JoinData() { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata() { Label = "Pan Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PanRight")]
-        public JoinDataComplete PanRight = new JoinDataComplete(new JoinData() { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata() { Label = "Pan Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ZoomIn")]
-        public JoinDataComplete ZoomIn = new JoinDataComplete(new JoinData() { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata() { Label = "Zoom In", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ZoomOut")]
-        public JoinDataComplete ZoomOut = new JoinDataComplete(new JoinData() { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata() { Label = "Zoom Out", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+        public uint IsOnline { get; set; }
+        public uint PowerOff { get; set; }
+        public uint PowerOn { get; set; }
+        public uint Up { get; set; }
+        public uint Down { get; set; }
+        public uint Left { get; set; }
+        public uint Right { get; set; }
+        public uint ZoomIn { get; set; }
+        public uint ZoomOut { get; set; }
+        public uint PresetRecallOffset { get; set; }
+        public uint PresetSaveOffset { get; set; }
+        public uint NumberOfPresets { get; set; }
 
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData() { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata() { Label = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PowerOn")]
-        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData() { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata() { Label = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PowerOff")]
-        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData() { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata() { Label = "Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("NumberOfPresets")]
-        public JoinDataComplete NumberOfPresets = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata() { Label = "Tells Essentials the number of defined presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        [JoinName("PresetRecallStart")]
-        public JoinDataComplete PresetRecallStart = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata() { Label = "Preset Recall Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PresetLabelStart")]
-        public JoinDataComplete PresetLabelStart = new JoinDataComplete(new JoinData() { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata() { Label = "Preset Label Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("PresetSaveStart")]
-        public JoinDataComplete PresetSaveStart = new JoinDataComplete(new JoinData() { JoinNumber = 31, JoinSpan = 20 }, new JoinMetadata() { Label = "Preset Save Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraModeAuto")]
-        public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData() { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeManual")]
-        public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData() { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeOff")]
-        public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData() { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata() { Label = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SupportsCameraModeAuto")]
-        public JoinDataComplete SupportsCameraModeAuto = new JoinDataComplete(new JoinData() { JoinNumber = 55, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Camera Mode Auto", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SupportsCameraModeOff")]
-        public JoinDataComplete SupportsCameraModeOff = new JoinDataComplete(new JoinData() { JoinNumber = 56, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Camera Mode Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SupportsPresets")]
-        public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData() { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata() { Label = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        public CameraControllerJoinMap(uint joinStart)
-            : base(joinStart, typeof(CameraControllerJoinMap))
+        public CameraControllerJoinMap()
         {
+            // Digital
+            IsOnline = 9;
+            PowerOff = 8;
+            PowerOn = 7;
+            Up = 1;
+            Down = 2;
+            Left = 3;
+            Right = 4;
+            ZoomIn = 5;
+            ZoomOut = 6;
+            PresetRecallOffset = 10;
+            PresetSaveOffset = 30;
+            NumberOfPresets = 5;
+            // Analog
+        }
+
+        public override void OffsetJoinNumbers(uint joinStart)
+        {
+            var joinOffset = joinStart - 1;
+
+            IsOnline = IsOnline + joinOffset;
+            PowerOff = PowerOff + joinOffset;
+            PowerOn = PowerOn + joinOffset;
+            Up = Up + joinOffset;
+            Down = Down + joinOffset;
+            Left = Left + joinOffset;
+            Right = Right + joinOffset;
+            ZoomIn = ZoomIn + joinOffset;
+            ZoomOut = ZoomOut + joinOffset;
+            PresetRecallOffset = PresetRecallOffset + joinOffset;
+            PresetSaveOffset = PresetSaveOffset + joinOffset;
         }
     }
 }

PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -1,4 +1,9 @@
-using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
@@ -9,21 +14,11 @@ namespace PepperDash.Essentials.Bridges
         /// </summary>
         public uint ProgramStartJoin { get; set; }
 
-        /// <summary>
-        /// Offset to indicate where the range of iterated Ethernet joins will start
-        /// </summary>
-        public uint EthernetStartJoin { get; set; }
-
         /// <summary>
         /// Offset between each program join set
         /// </summary>
         public uint ProgramOffsetJoin { get; set; }
 
-        /// <summary>
-        /// Offset between each Ethernet Interface join set
-        /// </summary>
-        public uint EthernetOffsetJoin { get; set; }
-
         #region Digitals
         /// <summary>
         /// Range Sets and reports whether the corresponding program slot is started
@@ -92,68 +87,6 @@ namespace PepperDash.Essentials.Bridges
         /// Serialized JSON output that aggregates the program info of the corresponding program
         /// </summary>
         public uint AggregatedProgramInfo { get; set; }
-        /// <summary>
-        /// Reports the controller serial number
-        /// </summary>
-        public uint SerialNumber { get; set; }
-        /// <summary>
-        /// Reports the controller model
-        /// </summary>
-        public uint Model { get; set; }
-        /// <summary>
-        /// Reports the Host name set on the corresponding interface
-        /// </summary>
-        public uint HostName { get; set; }
-        /// <summary>
-        /// Reports the Current IP address set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned address.
-        /// </summary>
-        public uint CurrentIpAddress { get; set; }
-        /// <summary>
-        /// Reporst the Current Default Gateway set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned gateway
-        /// </summary>
-        public uint CurrentDefaultGateway { get; set; }
-        /// <summary>
-        /// Reports the Current Subnet Mask set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned subnet mask
-        /// </summary>
-        public uint CurrentSubnetMask { get; set; }
-        /// <summary>
-        /// Reports the Static IP address set on the corresponding interface. If DHCP is disabled, this will match the Current IP address
-        /// </summary>
-        public uint StaticIpAddress { get; set; }
-        /// <summary>
-        /// Reporst the Static Default Gateway set on the corresponding interface. If DHCP is disabled, this will match the Current gateway
-        /// </summary>
-        public uint StaticDefaultGateway { get; set; }
-        /// <summary>
-        /// Reports the Current Subnet Mask set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned subnet mask
-        /// </summary>
-        public uint StaticSubnetMask { get; set; }
-        /// <summary>
-        /// Reports the current DomainFeedback on the corresponding interface
-        /// </summary>
-        public uint Domain { get; set; }
-        /// <summary>
-        /// Reports the current DNS Servers on the corresponding interface
-        /// </summary>
-        public uint DnsServer { get; set; }
-        /// <summary>
-        /// Reports the MAC Address of the corresponding interface
-        /// </summary>
-        public uint MacAddress { get; set; }
-        /// <summary>
-        /// Reports the DHCP Status of the corresponding interface
-        /// </summary>
-        public uint DhcpStatus { get; set; }
-
-        /// <summary>
-        /// Reports the current uptime. Updated in 5 minute intervals.
-        /// </summary>
-        public uint Uptime { get; set; }
-
-        /// <summary>
-        /// Reports the date of the last boot
-        /// </summary>
-        public uint LastBoot { get; set; }
         #endregion
 
         public SystemMonitorJoinMap()
@@ -165,10 +98,6 @@ namespace PepperDash.Essentials.Bridges
             SnmpAppVersion = 3;
             BACnetAppVersion = 4;
             ControllerVersion = 5;
-            SerialNumber = 6;
-            Model = 7;
-            Uptime = 8;
-            LastBoot = 9;
 
 
             ProgramStartJoin = 10;
@@ -186,23 +115,6 @@ namespace PepperDash.Essentials.Bridges
             ProgramCrestronDatabaseVersion = 3;
             ProgramEnvironmentVersion = 4;
             AggregatedProgramInfo = 5;
-
-            EthernetStartJoin = 75;
-
-            EthernetOffsetJoin = 15;
-
-            // Offset in groups of 15
-            HostName = 1;
-            CurrentIpAddress = 2;
-            CurrentSubnetMask = 3;
-            CurrentDefaultGateway = 4;
-            StaticIpAddress = 5;
-            StaticSubnetMask = 6;
-            StaticDefaultGateway = 7;
-            Domain = 8;
-            DnsServer = 9;
-            MacAddress = 10;
-            DhcpStatus = 11;
         }
 
         public override void OffsetJoinNumbers(uint joinStart)
@@ -219,7 +131,6 @@ namespace PepperDash.Essentials.Bridges
 
             // Sets the initial join value where the iterated program joins will begin
             ProgramStartJoin = ProgramStartJoin + joinOffset;
-            EthernetStartJoin = EthernetStartJoin + joinOffset;
         }
     }
 }

PepperDashEssentials/Bridges/StatusSignControllerBridge.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials.Bridges
         {
             var joinMap = new StatusSignControllerJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if (!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<StatusSignControllerJoinMap>(joinMapSerialized);

PepperDashEssentials/Bridges/SystemMonitorBridge.cs

@@ -1,4 +1,9 @@
-using Crestron.SimplSharpPro.DeviceSupport;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Diagnostics;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -12,9 +17,9 @@ namespace PepperDash.Essentials.Bridges
     {
         public static void LinkToApi(this SystemMonitorController systemMonitorController, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = new SystemMonitorJoinMap();
+            SystemMonitorJoinMap joinMap = new SystemMonitorJoinMap();
 
-            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
             if(!string.IsNullOrEmpty(joinMapSerialized))
                 joinMap = JsonConvert.DeserializeObject<SystemMonitorJoinMap>(joinMapSerialized);
@@ -25,71 +30,36 @@ namespace PepperDash.Essentials.Bridges
             Debug.Console(2, systemMonitorController, "Linking API starting at join: {0}", joinStart);
 
             systemMonitorController.TimeZoneFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeZone]);
+            //trilist.SetUShortSigAction(joinMap.TimeZone, new Action<ushort>(u => systemMonitorController.SetTimeZone(u)));
             systemMonitorController.TimeZoneTextFeedback.LinkInputSig(trilist.StringInput[joinMap.TimeZoneName]);
 
-            systemMonitorController.IoControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
+            systemMonitorController.IOControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
             systemMonitorController.SnmpVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.SnmpAppVersion]);
-            systemMonitorController.BaCnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
+            systemMonitorController.BACnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
             systemMonitorController.ControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.ControllerVersion]);
-            systemMonitorController.SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumber]);
-            systemMonitorController.ModelFeedback.LinkInputSig(trilist.StringInput[joinMap.Model]);
-            systemMonitorController.UptimeFeedback.LinkInputSig(trilist.StringInput[joinMap.Uptime]);
-            systemMonitorController.LastStartFeedback.LinkInputSig(trilist.StringInput[joinMap.LastBoot]);
 
             // iterate the program status feedback collection and map all the joins
-            LinkProgramInfoJoins(systemMonitorController, trilist, joinMap);
-
-            LinkEthernetInfoJoins(systemMonitorController, trilist, joinMap);
-        }
-
-        private static void LinkEthernetInfoJoins(SystemMonitorController systemMonitorController, BasicTriList trilist, SystemMonitorJoinMap joinMap)
-        {
-            var ethernetSlotJoinStart = joinMap.EthernetStartJoin;
-
-            foreach (var fb in systemMonitorController.EthernetStatusFeedbackCollection)
-            {
-                fb.Value.CurrentIpAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentIpAddress]);
-                fb.Value.CurrentSubnetMaskFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentSubnetMask]);
-                fb.Value.CurrentDefaultGatewayFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentDefaultGateway]);
-                fb.Value.StaticIpAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticIpAddress]);
-                fb.Value.StaticSubnetMaskFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticSubnetMask]);
-                fb.Value.StaticDefaultGatewayFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticDefaultGateway]);
-                fb.Value.HostNameFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.HostName]);
-                fb.Value.MacAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.MacAddress]);
-                fb.Value.DomainFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.Domain]);
-                fb.Value.DnsServerFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.DnsServer]);
-                fb.Value.DhcpStatusFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.DhcpStatus]);
-
-                ethernetSlotJoinStart += joinMap.EthernetOffsetJoin;
-            }
-        }
-
-        private static void LinkProgramInfoJoins(SystemMonitorController systemMonitorController, BasicTriList trilist,
-            SystemMonitorJoinMap joinMap)
-        {
             var programSlotJoinStart = joinMap.ProgramStartJoin;
 
             foreach (var p in systemMonitorController.ProgramStatusFeedbackCollection)
             {
                 var programNumber = p.Value.Program.Number;
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart,
-                    b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start));
                 p.Value.ProgramStartedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStart]);
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStop,
-                    b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Stop);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStop, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Stop));
                 p.Value.ProgramStoppedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStop]);
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramRegister,
-                    b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Register);
-                p.Value.ProgramRegisteredFeedback.LinkInputSig(
-                    trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramRegister]);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramRegister, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Register));
+                p.Value.ProgramRegisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramRegister]);
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramUnregister,
-                    b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister);
-                p.Value.ProgramUnregisteredFeedback.LinkInputSig(
-                    trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramUnregister, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister));
+                p.Value.ProgramUnregisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]);
 
                 p.Value.ProgramNameFeedback.LinkInputSig(trilist.StringInput[programSlotJoinStart + joinMap.ProgramName]);
                 p.Value.ProgramCompileTimeFeedback.LinkInputSig(

PepperDashEssentials/ControlSystem.cs

@@ -25,7 +25,6 @@ namespace PepperDash.Essentials
     {
         HttpLogoServer LogoServer;
 
-
         public ControlSystem()
             : base()
         {
@@ -47,12 +46,7 @@ namespace PepperDash.Essentials
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
-            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(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
-
+            // CrestronConsole.AddNewConsoleCommand(S => { ConfigWriter.WriteConfigFile(null); }, "writeconfig", "writes the current config to a file", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(s =>
             {
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "CONSOLE MESSAGE: {0}", s);
@@ -84,12 +78,10 @@ namespace PepperDash.Essentials
                 GoWithLoad();
         }
 
-
-
         /// <summary>
         /// Determines if the program is running on a processor (appliance) or server (VC-4).
         /// 
-        /// Sets Global.FilePathPrefix and Global.ApplicationDirectoryPathPrefix based on platform
+        /// Sets Global.FilePathPrefix based on platform
         /// </summary>
         public void DeterminePlatform()
         {
@@ -116,7 +108,7 @@ namespace PepperDash.Essentials
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials v{0} on 3-series Appliance", Global.AssemblyVersion);
 
                     // Check if User/ProgramX exists
-                    if (Directory.Exists(Global.ApplicationDirectoryPathPrefix + dirSeparator + "User"
+                    if (Directory.Exists(directoryPrefix + dirSeparator + "User"
                         + dirSeparator + string.Format("program{0}", InitialParametersClass.ApplicationNumber)))
                     {
                         Debug.Console(0, @"User/program{0} directory found", InitialParametersClass.ApplicationNumber);
@@ -166,13 +158,11 @@ namespace PepperDash.Essentials
 
                 Debug.Console(0, Debug.ErrorLogLevel.Notice, "Starting Essentials load from configuration");
 
-                PluginLoader.AddProgramAssemblies();
-
                 var filesReady = SetupFilesystem();
                 if (filesReady)
                 {
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Checking for plugins");
-                    PluginLoader.LoadPlugins();
+                    LoadPlugins();
 
                     Debug.Console(0, Debug.ErrorLogLevel.Notice, "Folder structure verified. Loading config...");
                     if (!ConfigReader.LoadConfig2())
@@ -207,7 +197,118 @@ namespace PepperDash.Essentials
 
         }
 
-       
+        /// <summary>
+        /// Initial simple implementation.  Reads user/programXX/plugins folder and 
+        /// use
+        /// </summary>
+        void LoadPlugins()
+        {
+            var dir = Global.FilePathPrefix + "plugins";
+            if (Directory.Exists(dir))
+            {
+                // TODO Clear out or create localPlugins folder (maybe in program slot folder)
+
+                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for factory plugins");
+                var di = new DirectoryInfo(dir);
+                var zFiles = di.GetFiles("*.cplz");
+                foreach (var fi in zFiles)
+                {
+                    Debug.Console(0, "Found cplz: {0}. Unzipping into plugins directory", fi.Name);
+                    var result = CrestronZIP.Unzip(fi.FullName, di.FullName);
+                    Debug.Console(0, "UnZip Result: {0}", result.ToString());
+                    fi.Delete();
+                }
+                var files = di.GetFiles("*.dll");
+                Dictionary<string, Assembly> assyList = new Dictionary<string, Assembly>();
+                foreach (FileInfo fi in files)
+                {
+                    // TODO COPY plugin to loadedPlugins folder 
+                    // TODO LOAD that loadedPlugins dll file
+                    try
+                    {
+                        var assy = Assembly.LoadFrom(fi.FullName);
+                        var ver = assy.GetName().Version;
+                        var verStr = string.Format("{0}.{1}.{2}.{3}", ver.Major, ver.Minor, ver.Build, ver.Revision);
+                        assyList.Add(fi.FullName, assy);
+                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded plugin file '{0}', version {1}", fi.FullName, verStr);
+                    }
+                    catch
+                    {
+                        Debug.Console(2, "Assembly {0} is not a custom assembly", fi.FullName);
+                        continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
+                    }
+                }
+                foreach (var assy in assyList)
+                {
+                    // iteratate this assembly's classes, looking for "LoadPlugin()" methods
+                    try
+                    {
+                        var types = assy.Value.GetTypes();
+                        foreach (var type in types)
+                        {
+                            try
+                            {
+                                var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
+                                var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
+                                if (loadPlugin != null)
+                                {
+                                    Debug.Console(2, "LoadPlugin method found in {0}", type.Name);
+
+                                    var fields = type.GetFields(BindingFlags.Public | BindingFlags.Static);
+
+                                    var minimumVersion = fields.FirstOrDefault(p => p.Name.Equals("MinimumEssentialsFrameworkVersion"));
+                                    if (minimumVersion != null)
+                                    {
+                                        Debug.Console(2, "MinimumEssentialsFrameworkVersion found");
+
+                                        var minimumVersionString = minimumVersion.GetValue(null) as string;
+
+                                        if (!string.IsNullOrEmpty(minimumVersionString))
+                                        {
+                                            var passed = Global.IsRunningMinimumVersionOrHigher(minimumVersionString);
+
+                                            if (!passed)
+                                            {
+                                                Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", minimumVersionString);
+                                                continue;
+                                            }
+                                            else
+                                            {
+                                                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", minimumVersionString);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion found but not set.  Loading plugin, but your mileage may vary.");
+                                        }
+                                    }
+                                    else
+                                    {
+                                        Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion not found.  Loading plugin, but your mileage may vary.");
+                                    }
+
+                                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Adding plugin: {0}", assy.Key);
+                                    loadPlugin.Invoke(null, null);
+                                }
+                            }
+                            catch
+                            {
+                                Debug.Console(2, "Load Plugin not found. {0} is not a plugin assembly", assy.Value.FullName);
+                                continue;
+                            }
+
+                        }
+                    }
+                    catch
+                    {
+                        Debug.Console(2, "Assembly {0} is not a custom assembly. Types cannot be loaded.", assy.Value.FullName);
+                        continue;
+                    }
+                }
+                // plugin dll will be loaded.  Any classes in plugin should have a static constructor
+                // that registers that class with the Core.DeviceFactory
+            }
+        }
 
         /// <summary>
         /// Verifies filesystem is set up. IR, SGD, and programX folders
@@ -290,13 +391,12 @@ 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"));
 

PepperDashEssentials/Factory/DeviceFactory.cs

@@ -69,7 +69,7 @@ namespace PepperDash.Essentials
 			{
 				var comm = CommFactory.GetControlPropertiesConfig(dc);
 
-				var bridge = new PepperDash.Essentials.Room.MobileControl.MobileControlSIMPLRoomBridge(key, name, comm.IpIdInt);
+				var bridge = new PepperDash.Essentials.Room.MobileControl.MobileControlDdvc01RoomBridge(key, name, comm.IpIdInt);
 				bridge.AddPreActivationAction(() =>
 				{
 					var parent = DeviceManager.AllDevices.FirstOrDefault(d => d.Key == "appServer") as MobileControlSystemController;

PepperDashEssentials/Fusion/EssentialsHuddleVtc1FusionController.cs

@@ -186,7 +186,7 @@ namespace PepperDash.Essentials.Fusion
 
 
             FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsHuddleVtc1Room).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff"));
             // NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
  
 
@@ -342,7 +342,7 @@ namespace PepperDash.Essentials.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as EssentialsHuddleVtc1Room).RunRouteAction("roomOff"); }); ;
             }
         }
     }

PepperDashEssentials/HttpApiHandler.cs

@@ -0,0 +1,266 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using Crestron.SimplSharp;
+//using Crestron.SimplSharp.CrestronIO;
+//using Crestron.SimplSharp.Net.Http;
+
+//using Newtonsoft.Json;
+//using Newtonsoft.Json.Linq;
+
+//using PepperDash.Essentials.Core;
+//using PepperDash.Essentials.Core.Http;
+//using PepperDash.Core;
+
+//namespace PepperDash.Essentials
+//{
+//    public class EssentialsHttpApiHandler
+//    {
+//        string ConfigPath;
+//        string PresetsPathPrefix;
+//        EssentialsHttpServer Server;
+
+//        /// <summary>
+//        /// 
+//        /// </summary>
+//        /// <param name="server">HTTP server to attach to</param>
+//        /// <param name="configPath">The full path to configuration file</param>
+//        /// <param name="presetsListPath">The folder prefix for the presets path, eq "\HTML\presets\"</param>
+//        public EssentialsHttpApiHandler(EssentialsHttpServer server, string configPath, string presetsPathPrefix)
+//        {
+//            if (server == null) throw new ArgumentNullException("server");
+//            Server = server;
+//            ConfigPath = configPath;
+//            PresetsPathPrefix = presetsPathPrefix;
+//            server.ApiRequest += Server_ApiRequest;
+//        }
+
+
+//        void Server_ApiRequest(object sender, Crestron.SimplSharp.Net.Http.OnHttpRequestArgs args)
+//        {
+//            try
+//            {
+//                var path = args.Request.Path.ToLower();
+
+//                if (path == "/api/config")
+//                    HandleApiConfig(args);
+//                else if (path.StartsWith("/api/presetslist/"))
+//                    HandleApiPresetsList(args);
+//                else if (path == "/api/presetslists")
+//                    HandleApiGetPresetsLists(args.Request, args.Response);
+//                else
+//                {
+//                    args.Response.Code = 404;
+//                    return;
+//                }
+//                args.Response.Header.SetHeaderValue("Access-Control-Allow-Origin", "*");
+//                args.Response.Header.SetHeaderValue("Access-Control-Allow-Methods", "GET, POST, PATCH, PUT, DELETE, OPTIONS");
+//            }
+//            catch (Exception e)
+//            {
+//                Debug.Console(1, "Uncaught HTTP server error: \n{0}", e);
+//                args.Response.Code = 500;
+//            }
+//        }
+
+//        /// <summary>
+//        /// GET will return the running configuration.  POST will attempt to take in a new config
+//        /// and restart the program.
+//        /// </summary>
+//        void HandleApiConfig(OnHttpRequestArgs args)
+//        {
+//            var request = args.Request;
+//            if (request.Header.RequestType == "GET")
+//            {
+//                if (File.Exists(ConfigPath))
+//                {
+//                    Debug.Console(2, "Sending config:{0}", ConfigPath);
+//                    args.Response.Header.ContentType = EssentialsHttpServer.GetContentType(new FileInfo(ConfigPath).Extension);
+//                    args.Response.ContentStream = new FileStream(ConfigPath, FileMode.Open, FileAccess.Read);
+//                }
+//            }
+//            else if (request.Header.RequestType == "POST")
+//            {
+//                Debug.Console(2, "Post type: '{0}'", request.Header.ContentType);
+				
+//                // Make sure we're receiving at least good json
+//                Debug.Console(1, "Receving new config");
+//                if (GetContentStringJson(args) == null)
+//                    return;
+
+//                //---------------------------- try to move these into common method
+//                // Move current file aside
+//                var bakPath = ConfigPath + ".bak";
+//                if (File.Exists(bakPath))
+//                    File.Delete(bakPath);
+//                File.Move(ConfigPath, bakPath);
+
+//                // Write the file
+//                using (FileStream fs = File.Open(ConfigPath, FileMode.OpenOrCreate))
+//                using (StreamWriter sw = new StreamWriter(fs))
+//                {
+//                    try
+//                    {
+//                        sw.Write(args.Request.ContentString);
+//                    }
+//                    catch (Exception e)
+//                    {
+//                        string err = string.Format("Error writing received config file:\r{0}", e);
+//                        CrestronConsole.PrintLine(err);
+//                        ErrorLog.Warn(err);
+//                        // Put file back
+//                        File.Move(ConfigPath + ".bak", ConfigPath);
+//                        args.Response.Code = 500;
+//                        return;
+//                    }
+//                }
+
+//                // If client says "yeah, restart" and has a good token
+//                // Restart program
+//                string consoleResponse = null;
+//                var restart = CrestronConsole.SendControlSystemCommand("progreset -p:" +
+//                    InitialParametersClass.ApplicationNumber, ref consoleResponse);
+//                if (!restart) Debug.Console(0, "CAN'T DO THAT YO: {0}", consoleResponse);
+//            }
+//        }
+
+//        void HandleApiPresetsList(OnHttpRequestArgs args)
+//        {
+//            var listPath = PresetsPathPrefix + args.Request.Path.Remove(0, 17);
+//            Debug.Console(2, "Checking for preset list '{0}'", listPath);
+
+//            if (args.Request.Header.RequestType == "GET")
+//            {
+//                if (File.Exists(listPath))
+//                {
+//                    Debug.Console(2, "Sending presets file:{0}", listPath);
+//                    args.Response.Header.ContentType = EssentialsHttpServer.GetContentType(new FileInfo(listPath).Extension);
+//                    args.Response.ContentStream = new FileStream(listPath, FileMode.Open, FileAccess.Read);
+//                }
+//            }
+//            else if (args.Request.Header.RequestType == "POST")
+//            {
+//                // Make sure we're receiving at least good json
+//                Debug.Console(1, "Receving new presets");
+//                if (GetContentStringJson(args) == null)
+//                    return;
+
+//                //---------------------------- try to move these into common method
+//                // Move current file aside
+//                var bakPath = listPath + ".new";
+//                Debug.Console(2, "Moving presets file to {0}", bakPath);
+//                if(File.Exists(bakPath))
+//                    File.Delete(bakPath);
+//                File.Move(listPath, bakPath);
+
+//                Debug.Console(2, "Writing new file");
+//                // Write the file
+//                using (FileStream fs = File.OpenWrite(listPath))
+//                using (StreamWriter sw = new StreamWriter(fs))
+//                {
+//                    try
+//                    {
+//                        Debug.Console(2, "Writing {1}, {0} bytes", args.Request.ContentString.Length, listPath);
+//                        sw.Write(args.Request.ContentString);
+//                    }
+//                    catch (Exception e)
+//                    {
+//                        string err = string.Format("Error writing received presets file:\r{0}", e);
+//                        CrestronConsole.PrintLine(err);
+//                        ErrorLog.Warn(err);
+//                        // Put file back
+//                        File.Move(listPath + ".bak", listPath);
+//                        args.Response.Code = 500;
+//                        return;
+//                    }
+//                }
+//            }
+//        }
+
+
+//        void HandleApiGetPresetsLists(HttpServerRequest request, HttpServerResponse response)
+//        {
+//            if (request.Header.RequestType != "GET")
+//            {
+//                response.Code = 404; // This should be a 405 with an allow header
+//                return;
+//            }
+
+//            if (Directory.Exists(PresetsPathPrefix))
+//            {
+//                //CrestronConsole.PrintLine("Parsing presets directory");
+//                List<string> files = Directory.GetFiles(PresetsPathPrefix, "*.json")
+//                    .ToList().Select(f => Path.GetFileName(f)).ToList();
+//                if (files.Count > 0)
+//                    files.Sort();
+//                var json = JsonConvert.SerializeObject(files);
+//                response.Header.ContentType = "application/json";
+//                response.ContentString = json;
+//            }
+
+//                        //    //CrestronConsole.PrintLine("Found {0} files", files.Count);
+//                        //    JObject jo = new JObject();
+//                        //    JArray ja = new JArray();
+						
+//                        //    foreach (var filename in files)
+//                        //    {
+//                        //        try
+//                        //        {
+//                        //            using (StreamReader sr = new StreamReader(filename))
+//                        //            {
+//                        //                JObject tempJo = JObject.Parse(sr.ReadToEnd());
+//                        //                if (tempJo.Value<string>("content").Equals("presetsList"))
+//                        //                {
+//                        //                    var jItem = new JObject(); // make a new object
+//                        //                    jItem.Add("Name", tempJo["name"]);
+//                        //                    jItem.Add("File", filename);
+//                        //                    jItem.Add("Url", Uri.EscapeUriString(new Uri(
+//                        //                        filename.Replace("\\html", "")
+//                        //                        .Replace("\\HTML", "")
+//                        //                        .Replace('\\', '/'), UriKind.Relative).ToString()));
+//                        //                    ja.Add(jItem); // add to array
+//                        //                }
+//                        //                else
+//                        //                    CrestronConsole.PrintLine("Cannot use presets file '{0}'", filename);
+//                        //            }
+//                        //        }
+//                        //        catch
+//                        //        {
+//                        //            // ignore failures - maybe delete them
+//                        //            CrestronConsole.PrintLine("Unable to read presets file '{0}'", filename);
+//                        //        }
+//                        //    }
+//                        //    jo.Add("PresetChannelLists", ja);
+//                        //    //CrestronConsole.PrintLine(jo.ToString());
+//                        //    response.Header.ContentType = "application/json";
+//                        //    response.ContentString = jo.ToString();
+//                        //}
+//                        //else
+//                        //    CrestronConsole.PrintLine("No presets files in directory");
+//        }
+
+//        /// <summary>
+//        /// Simply does what it says
+//        /// </summary>
+//        JObject GetContentStringJson(OnHttpRequestArgs args)
+//        {
+//            //var content = args.Request.ContentString;
+//            //Debug.Console(1, "{0}", content);
+
+//            try
+//            {
+//                // just see if it parses properly
+//                return JObject.Parse(args.Request.ContentString);
+//            }
+//            catch (Exception e)
+//            {
+//                string err = string.Format("JSON Error reading config file:\r{0}", e);
+//                CrestronConsole.PrintLine(err);
+//                ErrorLog.Warn(err);
+//                args.Response.Code = 400; // Bad request
+//                return null;
+//            }
+//        }
+//    }
+//}

PepperDashEssentials/PepperDashEssentials.csproj

@@ -108,21 +108,13 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AppServer\Messengers\CameraBaseMessenger.cs" />
     <Compile Include="AppServer\Messengers\ConfigMessenger.cs" />
-    <Compile Include="AppServer\Messengers\SIMPLAtcMessenger.cs" />
+    <Compile Include="AppServer\Messengers\Ddvc01AtcMessenger.cs" />
     <Compile Include="AppServer\Messengers\AudioCodecBaseMessenger.cs" />
-    <Compile Include="AppServer\Messengers\SIMPLVtcMessenger.cs" />
-    <Compile Include="AppServer\Messengers\IRunRouteActionMessenger.cs" />
+    <Compile Include="AppServer\Messengers\Ddvc01VtcMessenger.cs" />
     <Compile Include="AppServer\Messengers\MessengerBase.cs" />
-    <Compile Include="AppServer\Messengers\SIMPLCameraMessenger.cs" />
-    <Compile Include="AppServer\Messengers\SimplMessengerPropertiesConfig.cs" />
-    <Compile Include="AppServer\Messengers\SIMPLRouteMessenger.cs" />
     <Compile Include="AppServer\Messengers\SystemMonitorMessenger.cs" />
     <Compile Include="AppServer\Messengers\VideoCodecBaseMessenger.cs" />
-    <Compile Include="AppServer\SIMPLJoinMaps\SIMPLVtcJoinMap.cs" />
-    <Compile Include="AppServer\SIMPLJoinMaps\SIMPLAtcJoinMap.cs" />
-    <Compile Include="AppServer\SIMPLJoinMaps\MobileControlSIMPLRoomJoinMap.cs" />
     <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
     <Compile Include="Bridges\AppleTvBridge.cs" />
     <Compile Include="Bridges\BridgeBase.cs" />
@@ -174,6 +166,7 @@
     <Compile Include="ControlSystem.cs" />
     <Compile Include="Factory\UiDeviceFactory.cs" />
     <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
+    <Compile Include="HttpApiHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
     <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
@@ -186,7 +179,7 @@
     <Compile Include="AppServer\MobileControlDdvc01DeviceBridge.cs" />
     <Compile Include="AppServer\Interfaces.cs" />
     <Compile Include="AppServer\RoomBridges\MobileControlBridgeBase.cs" />
-    <Compile Include="AppServer\RoomBridges\MobileControlSIMPLRoomBridge.cs" />
+    <Compile Include="AppServer\RoomBridges\MobileControlDdvc01RoomBridge.cs" />
     <Compile Include="AppServer\RoomBridges\MobileControlEssentialsHuddleSpaceRoomBridge.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IChannelExtensions.cs" />
     <Compile Include="AppServer\DeviceTypeInterfaces\IColorExtensions.cs" />

PepperDashEssentials/PluginLoading/PluginLoading.cs

@@ -1,491 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Plugins;
-
-namespace PepperDash.Essentials
-{
-    /// <summary>
-    /// Deals with loading plugins at runtime
-    /// </summary>
-    public static class PluginLoader
-    {
-        /// <summary>
-        /// The complete list of loaded assemblies. Includes Essentials Framework assemblies and plugins
-        /// </summary>
-        public static List<LoadedAssembly> LoadedAssemblies { get; private set; }
-
-        /// <summary>
-        /// The list of assemblies loaded from the plugins folder
-        /// </summary>
-        static List<LoadedAssembly> LoadedPluginFolderAssemblies;
-
-        /// <summary>
-        /// The directory to look in for .cplz plugin packages
-        /// </summary>
-        static string _pluginDirectory = Global.FilePathPrefix + "plugins";
-
-        /// <summary>
-        /// The directory where plugins will be moved to and loaded from
-        /// </summary>
-        static string _loadedPluginsDirectoryPath = _pluginDirectory + Global.DirectorySeparator + "loadedAssemblies";
-
-        // The temp directory where .cplz archives will be unzipped to
-        static string _tempDirectory = _pluginDirectory + Global.DirectorySeparator + "temp";
-
-        static PluginLoader()
-        {
-            LoadedAssemblies = new List<LoadedAssembly>();
-            LoadedPluginFolderAssemblies = new List<LoadedAssembly>();
-        }
-
-        /// <summary>
-        /// Retrieves all the loaded assemblies from the program directory
-        /// </summary>
-        public static void AddProgramAssemblies()
-        {
-            Debug.Console(2, "Getting Assemblies loaded with Essentials");
-            // Get the loaded assembly filenames
-            var appDi = new DirectoryInfo(Global.ApplicationDirectoryPathPrefix);
-            var assemblyFiles = appDi.GetFiles("*.dll");
-
-            Debug.Console(2, "Found {0} Assemblies", assemblyFiles.Length);
-
-            foreach (var fi in assemblyFiles)
-            {
-                string version = string.Empty;
-                Assembly assembly = null;
-
-                switch (fi.Name)
-                {
-                    case ("PepperDashEssentials.dll"):
-                        {
-                            version = Global.AssemblyVersion;
-                            assembly = Assembly.GetExecutingAssembly();
-                            break;
-                        }
-                    case ("PepperDashEssentialsBase.dll"):
-                        {
-
-                            break;
-                        }
-                    case ("PepperDash_Core.dll"):
-                        {
-                            version = PepperDash.Core.Debug.PepperDashCoreVersion;
-                            break;
-                        }
-                }
-
-                LoadedAssemblies.Add(new LoadedAssembly(fi.Name, version, assembly));
-            }
-
-            if (Debug.Level > 1)
-            {
-                Debug.Console(2, "Loaded Assemblies:");
-
-                foreach (var assembly in LoadedAssemblies)
-                {
-                    Debug.Console(2, "Assembly: {0}", assembly.Name);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Loads an assembly via Reflection and adds it to the list of loaded assemblies
-        /// </summary>
-        /// <param name="fileName"></param>
-        static LoadedAssembly LoadAssembly(string filePath)
-        {
-                Debug.Console(2, "Attempting to load {0}", filePath);
-                var assembly = Assembly.LoadFrom(filePath);
-                if (assembly != null)
-                {
-                    var assyVersion = GetAssemblyVersion(assembly);
-
-                    var loadedAssembly = new LoadedAssembly(assembly.GetName().Name, assyVersion, assembly);
-                    LoadedAssemblies.Add(loadedAssembly);
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded assembly '{0}', version {1}", loadedAssembly.Name, loadedAssembly.Version);
-                    return loadedAssembly;
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to load assembly: '{0}'", filePath);
-                }
-
-            return null;
-
-        }
-
-        /// <summary>
-        /// Attempts to get the assembly informational version and if not possible gets the version
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        static string GetAssemblyVersion(Assembly assembly)
-        {
-            var ver = assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
-            if (ver != null && ver.Length > 0)
-            {
-                // Get the AssemblyInformationalVersion              
-                AssemblyInformationalVersionAttribute verAttribute = ver[0] as AssemblyInformationalVersionAttribute;
-                return verAttribute.InformationalVersion;
-            }
-            else
-            {
-                // Get the AssemblyVersion
-                var version = assembly.GetName().Version;
-                var verStr = string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
-                return verStr;
-            }
-        }
-
-        /// <summary>
-        /// Checks if the filename matches an already loaded assembly file's name
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <returns>True if file already matches loaded assembly file.</returns>
-        public static bool CheckIfAssemblyLoaded(string name)
-        {
-            Debug.Console(2, "Checking if assembly: {0} is loaded...", name);
-            var loadedAssembly = LoadedAssemblies.FirstOrDefault(s => s.Name.Equals(name));
-
-            if (loadedAssembly != null)
-            {
-                Debug.Console(2, "Assembly already loaded.");
-                return true;
-            }
-            else
-            {
-                Debug.Console(2, "Assembly not loaded.");
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Used by console command to report the currently loaded assemblies and versions
-        /// </summary>
-        /// <param name="command"></param>
-        public static void ReportAssemblyVersions(string command)
-        {
-            Debug.Console(0, "Loaded Assemblies:");
-            foreach (var assembly in LoadedAssemblies)
-            {
-                Debug.Console(0, "{0} Version: {1}", assembly.Name, assembly.Version);
-            }
-        }
-
-        /// <summary>
-        /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
-        /// </summary>
-        static void MoveDllAssemblies()
-        {
-            Debug.Console(0, "Looking for .dll assemblies from plugins folder...");
-
-            var pluginDi = new DirectoryInfo(_pluginDirectory);
-            var pluginFiles = pluginDi.GetFiles("*.dll");
-
-            if (pluginFiles.Length > 0)
-            {
-                if (!Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    Directory.CreateDirectory(_loadedPluginsDirectoryPath);
-                }
-            }
-
-            foreach (var pluginFile in pluginFiles)
-            {
-                try
-                {
-                    Debug.Console(0, "Found .dll: {0}", pluginFile.Name);
-
-                    if (!CheckIfAssemblyLoaded(pluginFile.Name))
-                    {
-                        string filePath = string.Empty;
-
-                        filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + pluginFile.Name;
-
-                        // Check if there is a previous file in the loadedPlugins directory and delete
-                        if (File.Exists(filePath))
-                        {
-                            Debug.Console(0, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath);
-                            File.Delete(filePath);
-                        }
-
-                        // Move the file
-                        File.Move(pluginFile.FullName, filePath);
-                        Debug.Console(2, "Moved {0} to {1}", pluginFile.FullName, filePath);
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Skipping assembly: {0}.  There is already an assembly with that name loaded.", pluginFile.FullName);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, "Error with plugin file {0} . Exception: {1}", pluginFile.FullName, e);
-                    continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                }
-            }
-
-            Debug.Console(0, "Done with .dll assemblies");
-        }
-
-        /// <summary>
-        /// Unzips each .cplz archive into the temp directory and moves any unloaded files into loadedPlugins
-        /// </summary>
-        static void UnzipAndMoveCplzArchives()
-        {
-            Debug.Console(0, "Looking for .cplz archives from plugins folder...");
-            var di = new DirectoryInfo(_pluginDirectory);
-            var zFiles = di.GetFiles("*.cplz");
-
-            if (zFiles.Length > 0)
-            {
-                if (!Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    Directory.CreateDirectory(_loadedPluginsDirectoryPath);
-                }
-            }
-
-            foreach (var zfi in zFiles)
-            {
-                Directory.CreateDirectory(_tempDirectory);
-                var tempDi = new DirectoryInfo(_tempDirectory);
-
-                Debug.Console(0, "Found cplz: {0}. Unzipping into temp plugins directory", zfi.Name);
-                var result = CrestronZIP.Unzip(zfi.FullName, tempDi.FullName);
-                Debug.Console(0, "UnZip Result: {0}", result.ToString());
-
-                var tempFiles = tempDi.GetFiles("*.dll");
-                foreach (var tempFile in tempFiles)
-                {
-                    try
-                    {
-                        if (!CheckIfAssemblyLoaded(tempFile.Name))
-                        {
-                            string filePath = string.Empty;
-
-                            filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + tempFile.Name;
-
-                            // Check if there is a previous file in the loadedPlugins directory and delete
-                            if (File.Exists(filePath))
-                            {
-                                Debug.Console(0, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath);
-                                File.Delete(filePath);
-                            }
-
-                            // Move the file
-                            File.Move(tempFile.FullName, filePath);
-                            Debug.Console(2, "Moved {0} to {1}", tempFile.FullName, filePath);
-                        }
-                        else
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Skipping assembly: {0}.  There is already an assembly with that name loaded.", tempFile.FullName);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(2, "Assembly {0} is not a custom assembly. Exception: {1}", tempFile.FullName, e);
-                        continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                    }  
-                }
-
-                // Delete the .cplz and the temp directory
-                Directory.Delete(_tempDirectory, true);
-                zfi.Delete();
-            }
-
-            Debug.Console(0, "Done with .cplz archives");
-        }
-
-        /// <summary>
-        /// Attempts to load the assemblies from the loadedPlugins folder
-        /// </summary>
-        static void LoadPluginAssemblies()
-        {
-            Debug.Console(0, "Loading assemblies from loadedPlugins folder...");
-            var pluginDi = new DirectoryInfo(_loadedPluginsDirectoryPath);
-            var pluginFiles = pluginDi.GetFiles("*.dll");
-
-            Debug.Console(2, "Found {0} plugin assemblies to load", pluginFiles.Length);
-
-            foreach (var pluginFile in pluginFiles)
-            {
-                var loadedAssembly = LoadAssembly(pluginFile.FullName);
-
-                LoadedPluginFolderAssemblies.Add(loadedAssembly);
-            }
-
-            Debug.Console(0, "All Plugins Loaded.");
-        }
-
-        /// <summary>
-        /// Iterate the loaded assemblies and try to call the LoadPlugin method
-        /// </summary>
-        static void LoadCustomPluginTypes()
-        {
-            Debug.Console(0, "Loading Custom Plugin Types...");
-            foreach (var loadedAssembly in LoadedPluginFolderAssemblies)
-            {
-                // iteratate this assembly's classes, looking for "LoadPlugin()" methods
-                try
-                {
-                    var assy = loadedAssembly.Assembly;
-                    var types = assy.GetTypes();
-                    foreach (var type in types)
-                    {
-                        try
-                        {
-                            if (typeof(IPluginDeviceFactory).IsAssignableFrom(type))
-                            {
-                                var plugin = (IPluginDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type); 
-                                LoadCustomPlugin(plugin, loadedAssembly);
-                            }
-                            else
-                            {
-                                var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
-                                var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
-                                if (loadPlugin != null)
-                                {
-                                    LoadCustomLegacyPlugin(type, loadPlugin, loadedAssembly);
-                                }
-                            }
-                      }
-                        catch (Exception e)
-                        {
-                            Debug.Console(2, "Load Plugin not found. {0} is not a plugin assembly. Exception: {1}", loadedAssembly.Name, e);
-                            continue;
-                        }
-
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, "Error Loading Assembly: {0} Exception: (1) ", loadedAssembly.Name, e);
-                    continue;
-                }
-            }
-            // plugin dll will be loaded.  Any classes in plugin should have a static constructor
-            // that registers that class with the Core.DeviceFactory
-            Debug.Console(0, "Done Loading Custom Plugin Types.");
-        }
-
-        /// <summary>
-        /// Loads a
-        /// </summary>
-        /// <param name="plugin"></param>
-        static void LoadCustomPlugin(IPluginDeviceFactory plugin, LoadedAssembly loadedAssembly)
-        {
-            var passed = Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
-
-            if (!passed)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", plugin.MinimumEssentialsFrameworkVersion);
-                return;
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", plugin.MinimumEssentialsFrameworkVersion);
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading plugin: {0}", loadedAssembly.Name);
-            plugin.LoadTypeFactories();
-        }
-
-        /// <summary>
-        /// Loads a a custom plugin via the legacy method
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="loadPlugin"></param>
-        static void LoadCustomLegacyPlugin(CType type, MethodInfo loadPlugin, LoadedAssembly loadedAssembly)
-        {
-            Debug.Console(2, "LoadPlugin method found in {0}", type.Name);
-
-            var fields = type.GetFields(BindingFlags.Public | BindingFlags.Static);
-
-            var minimumVersion = fields.FirstOrDefault(p => p.Name.Equals("MinimumEssentialsFrameworkVersion"));
-            if (minimumVersion != null)
-            {
-                Debug.Console(2, "MinimumEssentialsFrameworkVersion found");
-
-                var minimumVersionString = minimumVersion.GetValue(null) as string;
-
-                if (!string.IsNullOrEmpty(minimumVersionString))
-                {
-                    var passed = Global.IsRunningMinimumVersionOrHigher(minimumVersionString);
-
-                    if (!passed)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", minimumVersionString);
-                        return;
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", minimumVersionString);
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion found but not set.  Loading plugin, but your mileage may vary.");
-                }
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion not found.  Loading plugin, but your mileage may vary.");
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading legacy plugin: {0}", loadedAssembly.Name);
-            loadPlugin.Invoke(null, null);
-  
-        }
-
-         /// <summary>
-        /// Loads plugins
-        /// </summary>
-        public static void LoadPlugins()
-        {
-            if (Directory.Exists(_pluginDirectory))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for plugins");
-
-                // Deal with any .dll files
-                MoveDllAssemblies();
-
-                // Deal with any .cplz files
-                UnzipAndMoveCplzArchives();
-
-				if(Directory.Exists(_loadedPluginsDirectoryPath)) {
-					// Load the assemblies from the loadedPlugins folder into the AppDomain
-					LoadPluginAssemblies();
-
-					// Load the types from any custom plugin assemblies
-					LoadCustomPluginTypes();
-				}
-            }
-        }
-    }
-
-    /// <summary>
-    /// Represents an assembly loaded at runtime and it's associated metadata
-    /// </summary>
-    public class LoadedAssembly
-    {
-        public string Name { get; private set; }
-        public string Version { get; private set; }
-        public Assembly Assembly { get; private set; }
-
-        public LoadedAssembly(string name, string version, Assembly assembly)
-        {
-            Name = name;
-            Version = version;
-            Assembly = assembly;
-        }
-    }
-}

PepperDashEssentials/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs

@@ -4,10 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
-
 namespace PepperDash.Essentials.Room.Config
 {
     /// <summary>
@@ -15,28 +11,9 @@ namespace PepperDash.Essentials.Room.Config
     /// </summary>
     public class EssentialsHuddleRoomPropertiesConfig : EssentialsRoomPropertiesConfig
     {
-        /// <summary>
-        /// The key of the default display device
-        /// </summary>
-        [JsonProperty("defaultDisplayKey")]
         public string DefaultDisplayKey { get; set; }
-
-        /// <summary>
-        /// The key of the default audio device
-        /// </summary>
-        [JsonProperty("defaultAudioKey")]
         public string DefaultAudioKey { get; set; }
-
-        /// <summary>
-        /// The key of the source list for the room
-        /// </summary>
-        [JsonProperty("sourceListKey")]
         public string SourceListKey { get; set; }
-
-        /// <summary>
-        /// The key of the default source item from the source list
-        /// </summary>
-        [JsonProperty("defaultSourceItem")]
         public string DefaultSourceItem { get; set; }
     }
 }

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -348,7 +348,7 @@ namespace PepperDash.Essentials
 
             CrestronEnvironment.Sleep(1000);
 
-            RunRouteAction("roomOff", SourceListKey);
+            RunRouteAction("roomOff");
         }
 
         /// <summary>
@@ -357,7 +357,7 @@ namespace PepperDash.Essentials
         public override bool RunDefaultPresentRoute()
         {
             if (DefaultSourceItem != null)
-                RunRouteAction(DefaultSourceItem, SourceListKey);
+                RunRouteAction(DefaultSourceItem);
 
             return DefaultSourceItem != null;
         }
@@ -368,7 +368,7 @@ namespace PepperDash.Essentials
         /// <returns></returns>
         public bool RunDefaultCallRoute()
         {
-            RunRouteAction(DefaultCodecRouteString, SourceListKey);
+            RunRouteAction(DefaultCodecRouteString);
             return true;
         }
 
@@ -376,9 +376,9 @@ namespace PepperDash.Essentials
         /// 
         /// </summary>
         /// <param name="routeKey"></param>
-        public void RunRouteAction(string routeKey, string sourceListKey)
+        public void RunRouteAction(string routeKey)
         {
-            RunRouteAction(routeKey,  sourceListKey, null);
+            RunRouteAction(routeKey, null);
         }
 
         /// <summary>
@@ -386,7 +386,7 @@ namespace PepperDash.Essentials
         /// route or commands
         /// </summary>
         /// <param name="name"></param>
-        public void RunRouteAction(string routeKey, string sourceListKey, Action successCallback)
+        public void RunRouteAction(string routeKey, Action successCallback)
         {
             // Run this on a separate thread
             new CTimer(o =>
@@ -398,10 +398,10 @@ namespace PepperDash.Essentials
                 {
 
                     Debug.Console(1, this, "Run route action '{0}'", routeKey);
-                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(sourceListKey);
+                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(SourceListKey);
                     if (dict == null)
                     {
-                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", sourceListKey);
+                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", SourceListKey);
                         return;
                     }
 
@@ -619,7 +619,7 @@ namespace PepperDash.Essentials
         {
             if (!EnablePowerOnToLastSource || LastSourceKey == null)
                 return;
-            RunRouteAction(LastSourceKey, SourceListKey);
+            RunRouteAction(LastSourceKey);
         }
 
         /// <summary>
@@ -630,7 +630,7 @@ namespace PepperDash.Essentials
             var allRooms = DeviceManager.AllDevices.Where(d =>
                 d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions);
             foreach (var room in allRooms)
-                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff", (room as EssentialsHuddleSpaceRoom).SourceListKey);
+                (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff");
         }
 
         #region IPrivacy Members

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -264,30 +264,8 @@ namespace PepperDash.Essentials
         /// <param name="routeKey"></param>
 		public void RunRouteAction(string routeKey)
 		{
-            RunRouteAction(routeKey, new Action(() => { }));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        /// <param name="souceListKey"></param>
-        /// <param name="successCallback"></param>
-        public void RunRouteAction(string routeKey, string souceListKey)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        /// <param name="souceListKey"></param>
-        /// <param name="successCallback"></param>
-        public void RunRouteAction(string routeKey, string souceListKey, Action successCallback)
-        {
-            throw new NotImplementedException();
-        }
+			RunRouteAction(routeKey, null);
+		}   
 
 		/// <summary>
 		/// Gets a source from config list SourceListKey and dynamically build and executes the

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -394,30 +394,8 @@ namespace PepperDash.Essentials
         /// <param name="routeKey"></param>
 		public void RunRouteAction(string routeKey)
 		{
-            RunRouteAction(routeKey, new Action(() => { }));
-		}
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        /// <param name="souceListKey"></param>
-        /// <param name="successCallback"></param>
-        public void RunRouteAction(string routeKey, string souceListKey)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="routeKey"></param>
-        /// <param name="souceListKey"></param>
-        /// <param name="successCallback"></param>
-        public void RunRouteAction(string routeKey, string souceListKey, Action successCallback)
-        {
-            throw new NotImplementedException();
-        }
+			RunRouteAction(routeKey, null);
+		}   
 
 		/// <summary>
 		/// Gets a source from config list SourceListKey and dynamically build and executes the

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -564,7 +564,7 @@ namespace PepperDash.Essentials
 		void UiSelectSource(string key)
 		{
 			// Run the route and when it calls back, show the source
-			CurrentRoom.RunRouteAction(key, new Action(() => { }));
+			CurrentRoom.RunRouteAction(key, null);
 		}
 
 		/// <summary>

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -726,7 +726,7 @@ namespace PepperDash.Essentials
         void UiSelectSource(string key)
         {
             // Run the route and when it calls back, show the source
-            CurrentRoom.RunRouteAction(key, new Action(() => { }));
+            CurrentRoom.RunRouteAction(key, null);
         }
 
         /// <summary>
@@ -941,7 +941,7 @@ namespace PepperDash.Essentials
                 if (_CurrentRoom != null)
                     _CurrentRoom.CurrentSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
-                TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
+                TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd"));
 
                 (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
             }
@@ -987,7 +987,7 @@ namespace PepperDash.Essentials
 				if (CurrentRoom.CurrentSourceInfo != null &&  CurrentRoom.CurrentSourceInfo.DisableCodecSharing)
 				{
 					Debug.Console(1, CurrentRoom, "Transitioning to in-call, cancelling non-sharable source");
-					CurrentRoom.RunRouteAction("codecOsd", CurrentRoom.SourceListKey);
+					CurrentRoom.RunRouteAction("codecOsd");
 				}
 			}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/BasicConfig.cs

@@ -39,25 +39,5 @@ namespace PepperDash.Essentials.Core.Config
 			
 			return SourceLists[key];
 		}
-
-        /// <summary>
-        /// Checks Devices for an item with a Key that matches and returns it if found. Otherwise, retunes null
-        /// </summary>
-        /// <param name="key">Key of desired device</param>
-        /// <returns></returns>
-        public DeviceConfig GetDeviceForKey(string key)
-        {
-            if (string.IsNullOrEmpty(key))
-                return null;
-
-            var deviceConfig = Devices.FirstOrDefault(d => d.Key.Equals(key));
-
-            if (deviceConfig != null)
-                return deviceConfig;
-            else
-            {
-                return null;
-            }
-        }
 	}
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericComm.cs

@@ -16,7 +16,8 @@ namespace PepperDash.Essentials.Core
     /// <summary>
     /// Serves as a generic wrapper class for all styles of IBasicCommuncation ports
     /// </summary>
-    public class GenericComm : ReconfigurableDevice
+    public class 
+        GenericComm : ReconfigurableDevice
     {
         EssentialsControlPropertiesConfig PropertiesConfig;
 
@@ -28,13 +29,6 @@ namespace PepperDash.Essentials.Core
             PropertiesConfig = CommFactory.GetControlPropertiesConfig(config);
 
             CommPort = CommFactory.CreateCommForDevice(config);
-
-        }
-
-        public static IKeyed BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
-            return new GenericComm(dc);
         }
 
         public void SetPortConfig(string portConfig)
@@ -57,19 +51,6 @@ namespace PepperDash.Essentials.Core
 
             ConfigWriter.UpdateDeviceConfig(config);
         }
-    }
-
-    public class GenericCommFactory : Essentials.Core.EssentialsDeviceFactory<GenericComm>
-    {
-        public GenericCommFactory()
-        {
-            TypeNames = new List<string>() { "genericComm" };
-        }
-
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
-        {
-            Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
-            return new GenericComm(dc);
-        }
-    }
+        
+     }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigReader.cs

@@ -64,22 +64,15 @@ namespace PepperDash.Essentials.Core.Config
 
                     if (configFiles != null)
                     {
-                        Debug.Console(2, "{0} config files found matching pattern", configFiles.Length);
-
                         if (configFiles.Length > 1)
                         {
                             Debug.Console(0, Debug.ErrorLogLevel.Error,
                                 "****Error: Multiple Portal Configuration files present. Please ensure only a single file exists and reset program.****");
                             return false;
                         }
-                        else if (configFiles.Length == 1)
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
-                        }
                         else
                         {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "No config file found.");
-                            return false;
+                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Found Portal config file: '{0}'", filePath);
                         }
                     }
                     else

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Essentials/ConfigWriter.cs

@@ -19,8 +19,7 @@ namespace PepperDash.Essentials.Core.Config
 
         public const long WriteTimeout = 30000;
 
-        public static CTimer WriteTimer;
-		static CCriticalSection fileLock = new CCriticalSection();
+        public static CTimer WriteTimer;
 
         /// <summary>
         /// Updates the config properties of a device
@@ -128,6 +127,8 @@ namespace PepperDash.Essentials.Core.Config
 
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Writing Configuration to file");
 
+            var fileLock = new CCriticalSection();
+
             Debug.Console(0, Debug.ErrorLogLevel.Notice, "Attempting to write config file: '{0}'", filePath);
 
             try

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

@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class
-    /// </summary>
-    public abstract class EssentialsDevice : Device
-    {
-        protected EssentialsDevice(string key)
-            : base(key)
-        {
-
-        }
-
-        protected EssentialsDevice(string key, string name)
-            : base(key, name)
-        {
-
-        }
-    }
-
-    /// <summary>
-    /// Devices the basic needs for a Device Factory
-    /// </summary>
-    public abstract class EssentialsDeviceFactory<T> : IDeviceFactory where T:EssentialsDevice
-    {
-        #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)
-            {
-                DeviceFactory.AddFactoryForType(typeName, BuildDevice);
-            }
-        }
-
-        /// <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
-    }
-
-    /// <summary>
-    /// Devices the basic needs for a Device Factory
-    /// </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/Devices/ReconfigurableDevice.cs

@@ -12,7 +12,7 @@ namespace PepperDash.Essentials.Core.Devices
     /// <summary>
     /// 
     /// </summary>
-    public abstract class ReconfigurableDevice : EssentialsDevice
+    public abstract class ReconfigurableDevice : Device
     {
         public event EventHandler<EventArgs> ConfigChanged;
 

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

@@ -67,68 +67,36 @@ namespace PepperDash.Essentials.Core
 		[JsonProperty("name")]
 		public string Name { get; set; }
 
-        /// <summary>
-        /// Specifies and icon for the source list item
-        /// </summary>
 		[JsonProperty("icon")]
 		public string Icon { get; set; }
 
-        /// <summary>
-        /// Alternate icon
-        /// </summary>
 		[JsonProperty("altIcon")]
 		public string AltIcon { get; set; }
 
-        /// <summary>
-        /// Indicates if the item should be included in the source list
-        /// </summary>
 		[JsonProperty("includeInSourceList")]
 		public bool IncludeInSourceList { get; set; }
 
-        /// <summary>
-        /// Used to specify the order of the items in the source list when displayed
-        /// </summary>
 		[JsonProperty("order")]
 		public int Order { get; set; }
 
-        /// <summary>
-        /// The key of the device for volume control
-        /// </summary>
 		[JsonProperty("volumeControlKey")]
 		public string VolumeControlKey { get; set; }
 
-        /// <summary>
-        /// The type of source list item
-        /// </summary>
 		[JsonProperty("type")]
 		[JsonConverter(typeof(StringEnumConverter))]
 		public eSourceListItemType Type { get; set; }
 
-        /// <summary>
-        /// The list of routes to execute for this source list item
-        /// </summary>
 		[JsonProperty("routeList")]
 		public List<SourceRouteListItem> RouteList { get; set; }
 
-        /// <summary>
-        /// Indicates if this source should be disabled for sharing to the far end call participants via codec content
-        /// </summary>
 		[JsonProperty("disableCodecSharing")]
 		public bool DisableCodecSharing { get; set; }
 
-        /// <summary>
-        /// Indicates if this source should be disabled for routing to a shared output
-        /// </summary>
 		[JsonProperty("disableRoutedSharing")]
 		public bool DisableRoutedSharing { get; set; }
 
         [JsonProperty("destinations")]
         public List<eSourceListItemDestinationTypes> Destinations { get; set; }
-        /// <summary>
-        /// A means to reference a source list for this source item, in the event that this source has an input that can have sources routed to it
-        /// </summary>
-        [JsonProperty("sourceListKey")]
-        public string SourceListKey { get; set; }
 
 		public SourceListItem()
 		{

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

@@ -48,6 +48,7 @@ namespace PepperDash.Essentials.Core
 
             var typeName = dc.Type.ToLower();
 
+
             // Check for types that have been added by plugin dlls. 
             if (FactoryMethods.ContainsKey(typeName))
             {
@@ -56,11 +57,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);
@@ -85,43 +86,5 @@ namespace PepperDash.Essentials.Core
 
             return null;
         }
-
-        /// <summary>
-        /// Prints the type names fromt the FactoryMethods collection.
-        /// </summary>
-        /// <param name="command"></param>
-        public static void GetDeviceFactoryTypes(string filter)
-        {
-            List<string> typeNames = new List<string>();
-
-            if (!string.IsNullOrEmpty(filter))
-            {
-                typeNames = FactoryMethods.Keys.Where(k => k.Contains(filter)).ToList();
-            }
-            else
-            {
-                typeNames = FactoryMethods.Keys.ToList();
-            }
-
-            Debug.Console(0, "Device Types:");
-
-            foreach (var type in typeNames)
-            {
-                Debug.Console(0, "type: '{0}'", type);
-            }
-        }
-    }
-
-
-    /// <summary>
-    /// Responsible for loading all of the device types
-    /// </summary>
-    public class CoreDeviceFactory
-    {
-        public CoreDeviceFactory()
-        {
-            var genComm = new GenericCommFactory() as IDeviceFactory;
-            genComm.LoadTypeFactories();
-        }
     }
 }

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

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines a class that is capable of loading device types
-    /// </summary>
-    public interface IDeviceFactory
-    {
-        /// <summary>
-        /// Will be called when the plugin is loaded by Essentials.  Must add any new types to the DeviceFactory using DeviceFactory.AddFactoryForType() for each new type
-        /// </summary>
-        void LoadTypeFactories();
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolFeedback.cs

@@ -34,34 +34,18 @@ namespace PepperDash.Essentials.Core
 
         List<Crestron.SimplSharpPro.DeviceSupport.Feedback> LinkedCrestronFeedbacks = new List<Crestron.SimplSharpPro.DeviceSupport.Feedback>();
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public BoolFeedback(Func<bool> valueFunc)
             : this(null, valueFunc)
         {
         }
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="key">Key to find this Feedback</param>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public BoolFeedback(string key, Func<bool> valueFunc)
             : base(key)
         {
             ValueFunc = valueFunc;
         }
 
+
         public override void FireUpdate()
         {
             bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntFeedback.cs

@@ -23,28 +23,11 @@ namespace PepperDash.Essentials.Core
         Func<int> ValueFunc;
         List<UShortInputSig> LinkedInputSigs = new List<UShortInputSig>();
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public IntFeedback(Func<int> valueFunc)
             : this(null, valueFunc)
         {
         }
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="key">Key to find this Feedback</param>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public IntFeedback(string key, Func<int> valueFunc)
             : base(key)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringFeedback.cs

@@ -7,7 +7,6 @@ using Crestron.SimplSharpPro;
 
 namespace PepperDash.Essentials.Core
 {
-
     public class StringFeedback : Feedback
     {
         public override string StringValue { get { return _StringValue; } } // ValueFunc.Invoke(); } }
@@ -19,33 +18,16 @@ namespace PepperDash.Essentials.Core
         public string TestValue { get; private set; }
 
         /// <summary>
-        /// Evaluated on FireUpdate
+        /// Evalutated on FireUpdate
         /// </summary>
         public Func<string> ValueFunc { get; private set; }
         List<StringInputSig> LinkedInputSigs = new List<StringInputSig>();
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public StringFeedback(Func<string> valueFunc)
             : this(null, valueFunc)
         {
         }
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="key">Key to find this Feedback</param>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public StringFeedback(string key, Func<string> valueFunc)
             : base(key)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -332,7 +332,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
 
             FusionRoom.SystemPowerOn.OutputSig.SetSigFalseAction((Room as EssentialsRoomBase).PowerOnToDefaultOrLastSource);
-            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IRunRouteAction).RunRouteAction("roomOff", Room.SourceListKey));
+            FusionRoom.SystemPowerOff.OutputSig.SetSigFalseAction(() => (Room as IRunRouteAction).RunRouteAction("roomOff"));
 			// NO!! room.RoomIsOn.LinkComplementInputSig(FusionRoom.SystemPowerOff.InputSig);
 			FusionRoom.ErrorMessage.InputSig.StringValue =
 				"3: 7 Errors: This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;This is a really long error message;";
@@ -1086,7 +1086,7 @@ namespace PepperDash.Essentials.Core.Fusion
 				SourceToFeedbackSigs.Add(pSrc, sigD.InputSig);
 
 				// And respond to selection in Fusion
-                sigD.OutputSig.SetSigFalseAction(() => (Room as IRunRouteAction).RunRouteAction(routeKey, Room.SourceListKey));
+                sigD.OutputSig.SetSigFalseAction(() => (Room as IRunRouteAction).RunRouteAction(routeKey));
 			}
 			catch (Exception)
 			{
@@ -1288,7 +1288,7 @@ namespace PepperDash.Essentials.Core.Fusion
 
                 // Current Source
                 var defaultDisplaySourceNone = FusionRoom.CreateOffsetBoolSig((uint)joinOffset + 8, displayName + "Source None", eSigIoMask.InputOutputSig);
-                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IRunRouteAction).RunRouteAction("roomOff", Room.SourceListKey); }); ;
+                defaultDisplaySourceNone.OutputSig.UserObject = new Action<bool>(b => { if (!b) (Room as IRunRouteAction).RunRouteAction("roomOff"); }); ;
             }
         }
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -98,7 +98,7 @@ namespace PepperDash.Essentials.Core
         {
             Debug.Console(2, "Comparing running version '{0}' to minimum version '{1}'", AssemblyVersion, minimumVersion);
 
-            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*).*");
+            var runtimeVersion = Regex.Match(AssemblyVersion, @"^(\d*).(\d*).(\d*)$");
 
             var runtimeVersionMajor = Int16.Parse(runtimeVersion.Groups[1].Value);
             var runtimeVersionMinor = Int16.Parse(runtimeVersion.Groups[2].Value);
@@ -107,7 +107,7 @@ namespace PepperDash.Essentials.Core
             // Check for beta build version
             if (runtimeVersionMajor == 0)
             {
-                Debug.Console(2, "Running Local Build.  Bypassing Dependency Check.");
+                Debug.Console(2, "Running Beta Build.  Bypassing Dependency Check.");
                 return true;
             }
 

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

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Crestron.SimplSharp.Reflection;
+using System.Text;
+using Crestron.SimplSharp;
 
-using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Core
 {
     public static class JoinMapHelper
@@ -17,41 +15,25 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         /// <param name="joinMapKey"></param>
         /// <returns></returns>
-        public static string GetSerializedJoinMapForDevice(string joinMapKey)
+        public static string GetJoinMapForDevice(string joinMapKey)
         {
             if (string.IsNullOrEmpty(joinMapKey))
                 return null;
 
             var joinMap = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
 
-            return joinMap;
-        }
-
-        /// <summary>
-        /// Attempts to find a custom join map by key and returns it deserialized if found
-        /// </summary>
-        /// <param name="joinMapKey"></param>
-        /// <returns></returns>
-        public static Dictionary<string, JoinData> TryGetJoinMapAdvancedForDevice(string joinMapKey)
-        {
-            if (string.IsNullOrEmpty(joinMapKey))
+            if (joinMap != null)
+            {
+                return joinMap;
+            }
+            else
                 return null;
-
-            var joinMapSerialzed = ConfigReader.ConfigObject.JoinMaps[joinMapKey];
-
-            if (joinMapSerialzed == null) return null;
-
-            var joinMapData = JsonConvert.DeserializeObject<Dictionary<string, JoinData>>(joinMapSerialzed);
-
-            return joinMapData;
         }
-
     }
 
     /// <summary>
     /// Base class for join maps
     /// </summary>
-    [Obsolete("This is being deprecated in favor of JoinMapBaseAdvanced")]
     public abstract class JoinMapBase
     {
         /// <summary>
@@ -60,407 +42,8 @@ namespace PepperDash.Essentials.Core
         /// <param name="joinStart"></param>
         public abstract void OffsetJoinNumbers(uint joinStart);
 
-        /// <summary>
-        /// The collection of joins and associated metadata
-        /// </summary>
-        public Dictionary<string, JoinMetadata> Joins = new Dictionary<string, JoinMetadata>();
-
-        /// <summary>
-        /// Prints the join information to console
-        /// </summary>
-        public void PrintJoinMapInfo()
-        {
-            Debug.Console(0, "{0}:\n", GetType().Name);
-
-            // 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));
-
-        }
-
-        /// <summary>
-        /// Returns  a sorted list by JoinNumber
-        /// </summary>
-        /// <param name="joins"></param>
-        /// <returns></returns>
-        List<KeyValuePair<string, JoinMetadata>> GetSortedJoins(Dictionary<string, JoinMetadata> joins)
-        {
-            var sortedJoins = joins.ToList();
-
-            sortedJoins.Sort((pair1, pair2) => pair1.Value.JoinNumber.CompareTo(pair2.Value.JoinNumber));
-
-            return sortedJoins;
-        }
-
-        void PrintJoinList(List<KeyValuePair<string, JoinMetadata>> joins)
-        {
-            foreach (var join in joins)
-            {
-                Debug.Console(0,
-                    @"Join Number: {0} | Label: '{1}' | JoinSpan: '{2}' | Type: '{3}' | Capabilities: '{4}'",
-                        join.Value.JoinNumber,
-                        join.Value.Label,
-                        join.Value.JoinSpan,
-                        join.Value.JoinType.ToString(),
-                        join.Value.JoinCapabilities.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Returns the join number for the join with the specified key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public uint GetJoinForKey(string key)
-        {
-            return Joins.ContainsKey(key) ? Joins[key].JoinNumber : 0;
-        }
-
-        /// <summary>
-        /// Returns the join span for the join with the specified key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public uint GetJoinSpanForKey(string key)
-        {
-            return Joins.ContainsKey(key) ? Joins[key].JoinSpan : 0;
-        }
-    }
-
-    /// <summary>
-    /// Base class for join maps
-    /// </summary>
-    public abstract class JoinMapBaseAdvanced
-    {
-        protected uint JoinOffset;
-
-        /// <summary>
-        /// The collection of joins and associated metadata
-        /// </summary>
-        public Dictionary<string, JoinDataComplete> Joins { get; private set; }
-
-        protected JoinMapBaseAdvanced(uint joinStart)
-        {
-            Joins = new Dictionary<string, JoinDataComplete>();
-
-            JoinOffset = joinStart - 1;
-        }
-
-        protected JoinMapBaseAdvanced(uint joinStart, Type type):this(joinStart)
-        {
-            AddJoins(type);
-        }
-
-        protected void AddJoins(Type type)
-        {
-            // Add all the JoinDataComplete properties to the Joins Dictionary and pass in the offset 
-            //Joins = this.GetType()
-            //    .GetCType()
-            //    .GetFields(BindingFlags.Public | BindingFlags.Instance)
-            //    .Where(field => field.IsDefined(typeof(JoinNameAttribute), true))
-            //    .Select(field => (JoinDataComplete)field.GetValue(this))
-            //    .ToDictionary(join => join.GetNameAttribute(), join =>
-            //        {
-            //            join.SetJoinOffset(_joinOffset);
-            //            return join;
-            //        });
-
-            //type = this.GetType(); <- this wasn't working because 'this' was always the base class, never the derived class
-            var fields =
-                type.GetCType()
-                    .GetFields(BindingFlags.Public | BindingFlags.Instance)
-                    .Where(f => f.IsDefined(typeof (JoinNameAttribute), true));
-
-            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.
-
-                if (value == null)
-                {
-                    Debug.Console(0, "Unable to caset base class to {0}", type.Name);
-                    continue;
-                }
-
-                value.SetJoinOffset(JoinOffset);
-
-                var joinName = value.GetNameAttribute(field);
-
-                if (String.IsNullOrEmpty(joinName)) continue;
-
-                Joins.Add(joinName, value);
-            }
-
-
-            PrintJoinMapInfo();
-        }
-
-        /// <summary>
-        /// Prints the join information to console
-        /// </summary>
-        public void PrintJoinMapInfo()
-        {
-            Debug.Console(0, "{0}:\n", GetType().Name);
-
-            // 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));
-
-        }
-
-        /// <summary>
-        /// Returns  a sorted list by JoinNumber
-        /// </summary>
-        /// <param name="joins"></param>
-        /// <returns></returns>
-        List<KeyValuePair<string, JoinDataComplete>> GetSortedJoins(Dictionary<string, JoinDataComplete> joins)
-        {
-            var sortedJoins = joins.ToList();
-
-            sortedJoins.Sort((pair1, pair2) => pair1.Value.JoinNumber.CompareTo(pair2.Value.JoinNumber));
-
-            return sortedJoins;
-        }
-
-        void PrintJoinList(List<KeyValuePair<string, JoinDataComplete>> joins)
-        {
-            foreach (var join in joins)
-            {
-                Debug.Console(0,
-                    @"Join Number: {0} | JoinSpan: '{1}' | Label: '{2}' | Type: '{3}' | Capabilities: '{4}'",
-                        join.Value.JoinNumber,
-                        join.Value.JoinSpan,
-                        join.Value.Metadata.Label,
-                        join.Value.Metadata.JoinType.ToString(),
-                        join.Value.Metadata.JoinCapabilities.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Attempts to find the matching key for the custom join and if found overwrites the default JoinData with the custom
-        /// </summary>
-        /// <param name="joinData"></param>
-        public void SetCustomJoinData(Dictionary<string, JoinData> joinData)
-        {
-            foreach (var customJoinData in joinData)
-            {
-                var join = Joins[customJoinData.Key];
-
-                if (join != null)
-                {
-                    join.SetCustomJoinData(customJoinData.Value);
-                }
-                else
-                {
-                    Debug.Console(2, "No mathcing key found in join map for: '{0}'", customJoinData.Key);
-                }
-            }
-
-            PrintJoinMapInfo();
-        }
-
-        ///// <summary>
-        ///// Returns the join number for the join with the specified key
-        ///// </summary>
-        ///// <param name="key"></param>
-        ///// <returns></returns>
-        //public uint GetJoinForKey(string key)
-        //{
-        //    return Joins.ContainsKey(key) ? Joins[key].JoinNumber : 0;
-        //}
-
-
-        ///// <summary>
-        ///// Returns the join span for the join with the specified key
-        ///// </summary>
-        ///// <param name="key"></param>
-        ///// <returns></returns>
-        //public uint GetJoinSpanForKey(string key)
-        //{
-        //    return Joins.ContainsKey(key) ? Joins[key].JoinSpan : 0;
-        //}
-    }
-
-    /// <summary>
-    /// Read = Provides feedback to SIMPL
-    /// Write = Responds to sig values from SIMPL
-    /// </summary>
-    [Flags]
-    public enum eJoinCapabilities
-    {
-        None = 0,
-        ToSIMPL = 1,
-        FromSIMPL = 2,
-        ToFromSIMPL = ToSIMPL | FromSIMPL
-    }
-
-    [Flags]
-    public enum eJoinType
-    {
-        None = 0,
-        Digital = 1,
-        Analog = 2,
-        Serial = 4,
-        DigitalAnalog = Digital | Analog,
-        DigitalSerial = Digital | Serial,
-        AnalogSerial = Analog | Serial,
-        DigitalAnalogSerial = Digital | Analog | Serial
-    }
-
-    /// <summary>
-    /// Metadata describing the join
-    /// </summary>
-    public class JoinMetadata
-    {
-        /// <summary>
-        /// Join number (based on join offset value)
-        /// </summary>
-        [JsonProperty("joinNumber")]
-        [Obsolete]
-        public uint JoinNumber { get; set; }
-        /// <summary>
-        /// Join range span.  If join indicates the start of a range of joins, this indicated the maximum number of joins in the range
-        /// </summary>
-        [Obsolete]
-        [JsonProperty("joinSpan")]
-        public uint JoinSpan { get; set; }
-
-        /// <summary>
-        /// A label for the join to better describe it's usage
-        /// </summary>
-        [JsonProperty("label")]
-        public string Label { get; set; }
-        /// <summary>
-        /// Signal type(s)
-        /// </summary>
-        [JsonProperty("joinType")]
-        public eJoinType JoinType { get; set; }
-        /// <summary>
-        /// Indicates whether the join is read and/or write
-        /// </summary>
-        [JsonProperty("joinCapabilities")]
-        public eJoinCapabilities JoinCapabilities { get; set; }
-        /// <summary>
-        /// Indicates a set of valid values (particularly if this translates to an enum
-        /// </summary>
-        [JsonProperty("validValues")]
-        public string[] ValidValues { get; set; }
 
     }
 
-    /// <summary>
-    /// Data describing the join.  Can be 
-    /// </summary>
-    public class JoinData
-    {
-        /// <summary>
-        /// Join number (based on join offset value)
-        /// </summary>
-        [JsonProperty("joinNumber")]
-        public uint JoinNumber { get; set; }
-        /// <summary>
-        /// Join range span.  If join indicates the start of a range of joins, this indicated the maximum number of joins in the range
-        /// </summary>
-        [JsonProperty("joinSpan")]
-        public uint JoinSpan { get; set; }
-    }
 
-    /// <summary>
-    /// A class to aggregate the JoinData and JoinMetadata for a join
-    /// </summary>
-    public class JoinDataComplete
-    {
-        private uint _joinOffset;
-
-        private JoinData _data;
-        public JoinMetadata Metadata { get; set; }
-
-        public JoinDataComplete(JoinData data, JoinMetadata metadata)
-        {
-            _data = data;
-            Metadata = metadata;
-        }
-
-        /// <summary>
-        /// Sets the join offset value
-        /// </summary>
-        /// <param name="joinOffset"></param>
-        public void SetJoinOffset(uint joinOffset)
-        {
-            _joinOffset = joinOffset;
-        }
-
-        /// <summary>
-        /// The join number (including the offset)
-        /// </summary>
-        public uint JoinNumber
-        {
-            get { return _data.JoinNumber+ _joinOffset; }
-            set { _data.JoinNumber = value; }
-        }
-
-        public uint JoinSpan
-        {
-            get { return _data.JoinSpan; }
-        }
-
-        public void SetCustomJoinData(JoinData customJoinData)
-        {
-            _data = customJoinData;
-        }
-
-        public string GetNameAttribute(MemberInfo memberInfo)
-        {
-            var name = string.Empty;
-            var attribute = (JoinNameAttribute)CAttribute.GetCustomAttribute(memberInfo, typeof(JoinNameAttribute));
-
-            if (attribute == null) return name;
-
-            name = attribute.Name;
-            Debug.Console(2, "JoinName Attribute value: {0}", name);
-            return name;
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.All)]
-    public class JoinNameAttribute : Attribute
-    {
-        private string _Name;
-
-        public JoinNameAttribute(string name)
-        {
-            Debug.Console(2, "Setting Attribute Name: {0}", name);
-            _Name = name;
-        }
-
-        public string Name
-        {
-            get { return _Name; }
-        }
-    }
 }

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/SystemMonitorController.cs

@@ -1,8 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.Diagnostics;
+
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -14,32 +19,18 @@ namespace PepperDash.Essentials.Core.Monitoring
     /// </summary>
     public class SystemMonitorController : Device
     {
-        private const long UptimePollTime = 300000;
-        private CTimer _uptimePollTimer;
-
-        private string _uptime;
-        private string _lastStart;
-
         public event EventHandler<EventArgs> SystemMonitorPropertiesChanged;
 
         public Dictionary<uint, ProgramStatusFeedbacks> ProgramStatusFeedbackCollection;
-        public Dictionary<short, EthernetStatusFeedbacks> EthernetStatusFeedbackCollection;
 
-        public IntFeedback TimeZoneFeedback { get; protected set; }
-        public StringFeedback TimeZoneTextFeedback { get; protected set; }
-
-        public StringFeedback IoControllerVersionFeedback { get; protected set; }
-        public StringFeedback SnmpVersionFeedback { get; protected set; }
-        public StringFeedback BaCnetAppVersionFeedback { get; protected set; }
-        public StringFeedback ControllerVersionFeedback { get; protected set; }
-
-        //new feedbacks. Issue #50
-        public StringFeedback SerialNumberFeedback { get; protected set; }
-        public StringFeedback ModelFeedback { get; set; }
-
-        public StringFeedback UptimeFeedback { get; set; }
-        public StringFeedback LastStartFeedback { get; set; }
+        public IntFeedback TimeZoneFeedback { get; set; }
+        public StringFeedback TimeZoneTextFeedback { get; set; }
 
+        public StringFeedback IOControllerVersionFeedback { get; set; }
+        public StringFeedback SnmpVersionFeedback { get; set; }
+        public StringFeedback BACnetAppVersionFeedback { get; set; }
+        public StringFeedback ControllerVersionFeedback { get; set; }
+        
         public SystemMonitorController(string key)
             : base(key)
         {
@@ -47,18 +38,21 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
 
-            TimeZoneFeedback = new IntFeedback(() => SystemMonitor.TimeZoneInformation.TimeZoneNumber);
-            TimeZoneTextFeedback = new StringFeedback(() => SystemMonitor.TimeZoneInformation.TimeZoneName);
+            //CrestronConsole.AddNewConsoleCommand(RefreshSystemMonitorData, "RefreshSystemMonitor", "Refreshes System Monitor Feedbacks", ConsoleAccessLevelEnum.AccessOperator);
 
-            IoControllerVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.IOPVersion);
-            SnmpVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.SNMPVersion);
-            BaCnetAppVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.BACNetVersion);
-            ControllerVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.ControlSystemVersion);
+            TimeZoneFeedback = new IntFeedback(new Func<int>( () => SystemMonitor.TimeZoneInformation.TimeZoneNumber));
+            TimeZoneTextFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.TimeZoneInformation.TimeZoneName));
 
-            SerialNumberFeedback = new StringFeedback(() => CrestronEnvironment.SystemInfo.SerialNumber);
-            ModelFeedback = new StringFeedback(() => InitialParametersClass.ControllerPromptName);
-            UptimeFeedback = new StringFeedback(() => _uptime);
-            LastStartFeedback = new StringFeedback(()=> _lastStart);
+            IOControllerVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.IOPVersion));
+            SnmpVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.SNMPVersion));
+            BACnetAppVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.BACNetVersion));
+            ControllerVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.ControlSystemVersion));
+
+            //var status = string.Format("System Monitor Status: \r TimeZone: {0}\rTimeZoneText: {1}\rIOControllerVersion: {2}\rSnmpAppVersionFeedback: {3}\rBACnetAppVersionFeedback: {4}\rControllerVersionFeedback: {5}",
+            //    SystemMonitor.TimeZoneInformation.TimeZoneNumber, SystemMonitor.TimeZoneInformation.TimeZoneName, SystemMonitor.VersionInformation.IOPVersion, SystemMonitor.VersionInformation.SNMPVersion,
+            //    SystemMonitor.VersionInformation.BACNetVersion, SystemMonitor.VersionInformation.ControlSystemVersion);
+                
+            //Debug.Console(1, this, status);
 
             ProgramStatusFeedbackCollection = new Dictionary<uint, ProgramStatusFeedbacks>();
 
@@ -68,132 +62,43 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramStatusFeedbackCollection.Add(prog.Number, program);
             }
 
-            CreateEthernetStatusFeedbacks();
-            UpdateEthernetStatusFeeedbacks();
-
-            _uptimePollTimer = new CTimer(PollUptime,null,0, UptimePollTime);
-
-            SystemMonitor.ProgramChange += SystemMonitor_ProgramChange;
-            SystemMonitor.TimeZoneInformation.TimeZoneChange += TimeZoneInformation_TimeZoneChange;
-            CrestronEnvironment.EthernetEventHandler += CrestronEnvironmentOnEthernetEventHandler;
-            CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironmentOnProgramStatusEventHandler;
-        }
-
-        private void CrestronEnvironmentOnProgramStatusEventHandler(eProgramStatusEventType programEventType)
-        {
-            if (programEventType != eProgramStatusEventType.Stopping) return;
-
-            _uptimePollTimer.Stop();
-            _uptimePollTimer.Dispose();
-            _uptimePollTimer = null;
-        }
-
-        private void PollUptime(object obj)
-        {
-            var consoleResponse = string.Empty;
-
-            CrestronConsole.SendControlSystemCommand("uptime", ref consoleResponse);
-
-            ParseUptime(consoleResponse);
-
-            UptimeFeedback.FireUpdate();
-            LastStartFeedback.FireUpdate();
-        }
-
-        private void ParseUptime(string response)
-        {
-            var splitString = response.Trim().Split('\r', '\n');
-
-            var lastStartRaw = splitString[2];
-            var lastStartIndex = lastStartRaw.IndexOf(':');
-
-            _lastStart = lastStartRaw.Substring(lastStartIndex + 1).Trim();
-
-            var uptimeRaw = splitString[0];
-
-            var forIndex = uptimeRaw.IndexOf("for", StringComparison.Ordinal);
-
-            //4 => "for " to get what's on the right
-            _uptime = uptimeRaw.Substring(forIndex + 4);
-        }
-
-        private void CrestronEnvironmentOnEthernetEventHandler(EthernetEventArgs ethernetEventArgs)
-        {
-            if (ethernetEventArgs.EthernetEventType != eEthernetEventType.LinkUp) return;
-
-            foreach (var fb in EthernetStatusFeedbackCollection)
-            {
-                fb.Value.UpdateEthernetStatus();
-            }
-        }
-
-        private void CreateEthernetStatusFeedbacks()
-        {
-            EthernetStatusFeedbackCollection = new Dictionary<short, EthernetStatusFeedbacks>();
-
-            Debug.Console(2, "Creating {0} EthernetStatusFeedbacks", InitialParametersClass.NumberOfEthernetInterfaces);
-
-            for (short i = 0; i < InitialParametersClass.NumberOfEthernetInterfaces; i++)
-            {
-                Debug.Console(2, "Creating EthernetStatusFeedback for Interface {0}", i);
-                var ethernetInterface = new EthernetStatusFeedbacks(i);
-                EthernetStatusFeedbackCollection.Add(i, ethernetInterface);
-            }
-        }
-
-        private void UpdateEthernetStatusFeeedbacks()
-        {
-            foreach (var iface in EthernetStatusFeedbackCollection)
-            {
-                iface.Value.CurrentIpAddressFeedback.FireUpdate();
-                iface.Value.CurrentSubnetMaskFeedback.FireUpdate();
-                iface.Value.CurrentDefaultGatewayFeedback.FireUpdate();
-                iface.Value.StaticIpAddressFeedback.FireUpdate();
-                iface.Value.StaticSubnetMaskFeedback.FireUpdate();
-                iface.Value.StaticDefaultGatewayFeedback.FireUpdate();
-                iface.Value.HostNameFeedback.FireUpdate();
-                iface.Value.DnsServerFeedback.FireUpdate();
-                iface.Value.DomainFeedback.FireUpdate();
-                iface.Value.DhcpStatusFeedback.FireUpdate();
-                iface.Value.MacAddressFeedback.FireUpdate();
-            }
+            SystemMonitor.ProgramChange += new ProgramStateChangeEventHandler(SystemMonitor_ProgramChange);
+            SystemMonitor.TimeZoneInformation.TimeZoneChange += new TimeZoneChangeEventHandler(TimeZoneInformation_TimeZoneChange);
         }
 
         /// <summary>
         /// Gets data in separate thread
         /// </summary>
-        private void RefreshSystemMonitorData()
+        /// <param name="command"></param>
+        void RefreshSystemMonitorData(string command)
         {
             // this takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke(UpdateFeedback);
+            CrestronInvoke.BeginInvoke((o) =>
+                {
+                    TimeZoneFeedback.FireUpdate();
+                    TimeZoneTextFeedback.FireUpdate();
+                    IOControllerVersionFeedback.FireUpdate();
+                    SnmpVersionFeedback.FireUpdate();
+                    BACnetAppVersionFeedback.FireUpdate();
+                    ControllerVersionFeedback.FireUpdate();
+
+                    OnSystemMonitorPropertiesChanged();
+                }
+            );
         }
 
-        private void UpdateFeedback(object o)
-        {
-            TimeZoneFeedback.FireUpdate();
-            TimeZoneTextFeedback.FireUpdate();
-            IoControllerVersionFeedback.FireUpdate();
-            SnmpVersionFeedback.FireUpdate();
-            BaCnetAppVersionFeedback.FireUpdate();
-            ControllerVersionFeedback.FireUpdate();
-            SerialNumberFeedback.FireUpdate();
-            ModelFeedback.FireUpdate();
-
-            OnSystemMonitorPropertiesChanged();
-        }
-
-        private void OnSystemMonitorPropertiesChanged()
+        void OnSystemMonitorPropertiesChanged()
         {
             var handler = SystemMonitorPropertiesChanged;
             if (handler != null)
             {
-                handler(this, new EventArgs());
+                handler(this, new EventArgs());   
             }
         }
 
         public override bool CustomActivate()
         {
-            RefreshSystemMonitorData();
+            RefreshSystemMonitorData(null);
 
             return base.CustomActivate();
         }
@@ -209,41 +114,46 @@ namespace PepperDash.Essentials.Core.Monitoring
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="args"></param>
-        private void SystemMonitor_ProgramChange(Program sender, ProgramEventArgs args)
+        void SystemMonitor_ProgramChange(Program sender, ProgramEventArgs args)
         {
             Debug.Console(2, this, "Program Change Detected for slot: {0}", sender.Number);
             Debug.Console(2, this, "Event Type: {0}", args.EventType);
 
             var program = ProgramStatusFeedbackCollection[sender.Number];
 
-            switch (args.EventType)
+            if (args.EventType == eProgramChangeEventType.OperatingState)
             {
-                case eProgramChangeEventType.OperatingState:
-                    program.ProgramStartedFeedback.FireUpdate();
-                    program.ProgramStoppedFeedback.FireUpdate();
-                    program.ProgramInfo.OperatingState = args.OperatingState;
-                    if (args.OperatingState == eProgramOperatingState.Start)
-                        program.GetProgramInfo();
-                    else
-                    {
-                        program.AggregatedProgramInfoFeedback.FireUpdate();
-                        program.OnProgramInfoChanged();
-                    }
-                    break;
-                case eProgramChangeEventType.RegistrationState:
-                    program.ProgramRegisteredFeedback.FireUpdate();
-                    program.ProgramUnregisteredFeedback.FireUpdate();
-                    program.ProgramInfo.RegistrationState = args.RegistrationState;
-                    program.GetProgramInfo();
-                    break;
+                program.ProgramStartedFeedback.FireUpdate();
+                program.ProgramStoppedFeedback.FireUpdate();
+
+                program.ProgramInfo.OperatingState = args.OperatingState;
+
+				//program.GetProgramInfo();
+
+				if (args.OperatingState == eProgramOperatingState.Start)
+					program.GetProgramInfo();
+				else
+				{
+					program.AggregatedProgramInfoFeedback.FireUpdate();
+					program.OnProgramInfoChanged();
+				}
             }
+            else if (args.EventType == eProgramChangeEventType.RegistrationState)
+            {
+                program.ProgramRegisteredFeedback.FireUpdate();
+                program.ProgramUnregisteredFeedback.FireUpdate();
+
+                program.ProgramInfo.RegistrationState = args.RegistrationState;
+
+                program.GetProgramInfo();
+            }         
         }
 
         /// <summary>
         /// Responds to time zone changes and updates the appropriate feedbacks
         /// </summary>
         /// <param name="args"></param>
-        private void TimeZoneInformation_TimeZoneChange(TimeZoneEventArgs args)
+        void TimeZoneInformation_TimeZoneChange(TimeZoneEventArgs args)
         {
             Debug.Console(2, this, "Time Zone Change Detected.");
             TimeZoneFeedback.FireUpdate();
@@ -252,121 +162,6 @@ namespace PepperDash.Essentials.Core.Monitoring
             OnSystemMonitorPropertiesChanged();
         }
 
-        public class EthernetStatusFeedbacks
-        {
-            public StringFeedback HostNameFeedback { get; protected set; }
-            public StringFeedback DnsServerFeedback { get; protected set; }
-            public StringFeedback DomainFeedback { get; protected set; }
-            public StringFeedback MacAddressFeedback { get; protected set; }
-            public StringFeedback DhcpStatusFeedback { get; protected set; }
-
-            public StringFeedback CurrentIpAddressFeedback { get; protected set; }
-            public StringFeedback CurrentSubnetMaskFeedback { get; protected set; }
-            public StringFeedback CurrentDefaultGatewayFeedback { get; protected set; }
-            
-            public StringFeedback StaticIpAddressFeedback { get; protected set; }
-            public StringFeedback StaticSubnetMaskFeedback { get; protected set; }
-            public StringFeedback StaticDefaultGatewayFeedback { get; protected set; }
-
-            public EthernetStatusFeedbacks(short adapterIndex)
-            {
-                Debug.Console(2, "Ethernet Information for interface {0}", adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Hostname: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Current IP Address: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Current Subnet Mask: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Current Router: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Static IP Address: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_STATIC_IPADDRESS, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Static Subnet Mask: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_STATIC_IPMASK, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Static Router: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_STATIC_ROUTER, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} DNS Servers: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} DHCP State: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Domain Name: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} MAC Address: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, adapterIndex), adapterIndex);
-                HostNameFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, adapterIndex));
-
-                CurrentIpAddressFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex));
-                CurrentDefaultGatewayFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex));
-                CurrentSubnetMaskFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex));
-                StaticIpAddressFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex));
-                StaticDefaultGatewayFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex));
-                StaticSubnetMaskFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex));
-                DomainFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, adapterIndex));
-                DnsServerFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, adapterIndex));
-                MacAddressFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, adapterIndex));
-
-                DhcpStatusFeedback = new StringFeedback(
-                    () =>
-                        CrestronEthernetHelper.GetEthernetParameter(
-                            CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, adapterIndex));
-            }
-
-            public void UpdateEthernetStatus()
-            {
-                HostNameFeedback.FireUpdate();
-                CurrentIpAddressFeedback.FireUpdate();
-                CurrentSubnetMaskFeedback.FireUpdate();
-                CurrentDefaultGatewayFeedback.FireUpdate();
-                StaticIpAddressFeedback.FireUpdate();
-                StaticSubnetMaskFeedback.FireUpdate();
-                StaticDefaultGatewayFeedback.FireUpdate();
-                DomainFeedback.FireUpdate();
-                DnsServerFeedback.FireUpdate();
-                MacAddressFeedback.FireUpdate();
-                DhcpStatusFeedback.FireUpdate();
-            }
-        }
-
 
         public class ProgramStatusFeedbacks
         {
@@ -397,19 +192,17 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramInfo.OperatingState = Program.OperatingState;
                 ProgramInfo.RegistrationState = Program.RegistrationState;
 
-                ProgramStartedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Start);
-                ProgramStoppedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Stop);
-                ProgramRegisteredFeedback =
-                    new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Register);
-                ProgramUnregisteredFeedback =
-                    new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Unregister);
+                ProgramStartedFeedback = new BoolFeedback(new Func<bool>( () => Program.OperatingState == eProgramOperatingState.Start));
+                ProgramStoppedFeedback = new BoolFeedback(new Func<bool>( () => Program.OperatingState == eProgramOperatingState.Stop));
+                ProgramRegisteredFeedback = new BoolFeedback(new Func<bool>( () => Program.RegistrationState == eProgramRegistrationState.Register));
+                ProgramUnregisteredFeedback = new BoolFeedback(new Func<bool>( () => Program.RegistrationState == eProgramRegistrationState.Unregister));
 
-                ProgramNameFeedback = new StringFeedback(() => ProgramInfo.ProgramFile);
-                ProgramCompileTimeFeedback = new StringFeedback(() => ProgramInfo.CompileTime);
-                CrestronDataBaseVersionFeedback = new StringFeedback(() => ProgramInfo.CrestronDb);
-                EnvironmentVersionFeedback = new StringFeedback(() => ProgramInfo.Environment);
+                ProgramNameFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.ProgramFile));
+                ProgramCompileTimeFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.CompileTime));
+                CrestronDataBaseVersionFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.CrestronDB));
+                EnvironmentVersionFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.Environment));
 
-                AggregatedProgramInfoFeedback = new StringFeedback(() => JsonConvert.SerializeObject(ProgramInfo));
+                AggregatedProgramInfoFeedback = new StringFeedback(new Func<string>(() => JsonConvert.SerializeObject(ProgramInfo)));
 
                 GetProgramInfo();
             }
@@ -419,99 +212,74 @@ namespace PepperDash.Essentials.Core.Monitoring
             /// </summary>
             public void GetProgramInfo()
             {
-                CrestronInvoke.BeginInvoke(GetProgramInfo);
-            }
-
-            private void GetProgramInfo(object o)
-            {
-                Debug.Console(2, "Attempting to get program info for slot: {0}", Program.Number);
-
-                string response = null;
-
-                if (Program.RegistrationState == eProgramRegistrationState.Unregister || Program.OperatingState == eProgramOperatingState.Stop)
+                CrestronInvoke.BeginInvoke((o) =>
                 {
-                    Debug.Console(2, "Program {0} not registered. Setting default values for program information.",
-                        Program.Number);
+                    Debug.Console(2, "Attempting to get program info for slot: {0}", Program.Number);
 
-                    ProgramInfo = new ProgramInfo(Program.Number)
+                    string response = null;
+
+                    var success = CrestronConsole.SendControlSystemCommand(string.Format("progcomments:{0}", Program.Number), ref response);
+
+                    if (success)
                     {
-                        OperatingState = Program.OperatingState,
-                        RegistrationState = Program.RegistrationState
-                    };
+                        //Debug.Console(2, "Progcomments Response: \r{0}", response);
 
-                    return;
-                }
+                        if (!response.ToLower().Contains("bad or incomplete"))
+                        {
+                            // Shared properteis
+                            ProgramInfo.ProgramFile = ParseConsoleData(response, "Program File", ": ", "\n");
+                            ProgramInfo.CompilerRevision = ParseConsoleData(response, "Compiler Rev", ": ", "\n");
+                            ProgramInfo.CompileTime = ParseConsoleData(response, "Compiled On", ": ", "\n");
+                            ProgramInfo.Include4Dat = ParseConsoleData(response, "Include4.dat", ": ", "\n");
 
-                var success = CrestronConsole.SendControlSystemCommand(
-                    string.Format("progcomments:{0}", Program.Number), ref response);
 
-                if (!success)
-                {
-                    Debug.Console(2, "Progcomments Attempt Unsuccessful for slot: {0}", Program.Number);
-                    UpdateFeedbacks();
-                    return;
-                }
 
-                if (response.ToLower().Contains("bad or incomplete"))
-                {
-                    Debug.Console(2,
-                        "Program in slot {0} not running.  Setting default ProgramInfo for slot: {0}",
-                        Program.Number);
+                            if (ProgramInfo.ProgramFile.Contains(".dll"))
+                            {
+                                // SSP Program
+                                ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ": ", "\n");
+                                ProgramInfo.ApplicationName = ParseConsoleData(response, "Application Name", ": ", "\n");
+                                ProgramInfo.ProgramTool = ParseConsoleData(response, "Program Tool", ": ", "\n");
+                                ProgramInfo.MinFirmwareVersion = ParseConsoleData(response, "Min Firmware Version", ": ", "\n");
+                                ProgramInfo.PlugInVersion = ParseConsoleData(response, "PlugInVersion", ": ", "\n");
+                            }
+                            else if (ProgramInfo.ProgramFile.Contains(".smw"))
+                            {
+                                // SIMPL Windows Program
+                                ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ":", "\n");
+                                ProgramInfo.SystemName = ParseConsoleData(response, "System Name", ": ", "\n");
+                                ProgramInfo.CrestronDB = ParseConsoleData(response, "CrestronDB", ": ", "\n");
+                                ProgramInfo.Environment = ParseConsoleData(response, "Source Env", ": ", "\n");
+                                ProgramInfo.Programmer = ParseConsoleData(response, "Programmer", ": ", "\n");
 
-                    // Assume no valid program info.  Constructing a new object will wipe all properties
-                    ProgramInfo = new ProgramInfo(Program.Number)
+                            }
+                            //Debug.Console(2, "ProgramInfo: \r{0}", JsonConvert.SerializeObject(ProgramInfo));
+                        }
+                        else
+                        {
+                            Debug.Console(2, "Bad or incomplete console command response.  Initializing ProgramInfo for slot: {0}", Program.Number);
+
+                            // Assume no valid program info.  Constructing a new object will wipe all properties
+                            ProgramInfo = new ProgramInfo(Program.Number);
+
+                            ProgramInfo.OperatingState = Program.OperatingState;
+                            ProgramInfo.RegistrationState = Program.RegistrationState;
+                        }
+                    }
+                    else
                     {
-                        OperatingState = Program.OperatingState,
-                        RegistrationState = Program.RegistrationState
-                    };
+                        Debug.Console(2, "Progcomments Attempt Unsuccessful for slot: {0}", Program.Number);
+                    }
 
-                    UpdateFeedbacks();
+                    ProgramNameFeedback.FireUpdate();
+                    ProgramCompileTimeFeedback.FireUpdate();
+                    CrestronDataBaseVersionFeedback.FireUpdate();
+                    EnvironmentVersionFeedback.FireUpdate();
 
-                    return;
-                }
+                    AggregatedProgramInfoFeedback.FireUpdate();
 
-
-                // Shared properteis
-                ProgramInfo.ProgramFile = ParseConsoleData(response, "Program File", ": ", "\n");
-                ProgramInfo.CompilerRevision = ParseConsoleData(response, "Compiler Rev", ": ", "\n");
-                ProgramInfo.CompileTime = ParseConsoleData(response, "Compiled On", ": ", "\n");
-                ProgramInfo.Include4Dat = ParseConsoleData(response, "Include4.dat", ": ", "\n");
-
-
-                if (ProgramInfo.ProgramFile.Contains(".dll"))
-                {
-                    // SSP Program
-                    ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ": ", "\n");
-                    ProgramInfo.ApplicationName = ParseConsoleData(response, "Application Name", ": ", "\n");
-                    ProgramInfo.ProgramTool = ParseConsoleData(response, "Program Tool", ": ", "\n");
-                    ProgramInfo.MinFirmwareVersion = ParseConsoleData(response, "Min Firmware Version", ": ",
-                        "\n");
-                    ProgramInfo.PlugInVersion = ParseConsoleData(response, "PlugInVersion", ": ", "\n");
-                }
-                else if (ProgramInfo.ProgramFile.Contains(".smw"))
-                {
-                    // SIMPL Windows Program
-                    ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ":", "\n");
-                    ProgramInfo.SystemName = ParseConsoleData(response, "System Name", ": ", "\n");
-                    ProgramInfo.CrestronDb = ParseConsoleData(response, "CrestronDB", ": ", "\n");
-                    ProgramInfo.Environment = ParseConsoleData(response, "Source Env", ": ", "\n");
-                    ProgramInfo.Programmer = ParseConsoleData(response, "Programmer", ": ", "\n");
-                }
-                Debug.Console(2, "Program info for slot {0} successfully updated", Program.Number);
-
-                UpdateFeedbacks();
-            }
-
-            private void UpdateFeedbacks()
-            {
-                ProgramNameFeedback.FireUpdate();
-                ProgramCompileTimeFeedback.FireUpdate();
-                CrestronDataBaseVersionFeedback.FireUpdate();
-                EnvironmentVersionFeedback.FireUpdate();
-
-                AggregatedProgramInfoFeedback.FireUpdate();
-
-                OnProgramInfoChanged();
+                    OnProgramInfoChanged();
+                });
             }
 
             public void OnProgramInfoChanged()
@@ -526,28 +294,30 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             private string ParseConsoleData(string data, string line, string startString, string endString)
             {
-                var outputData = "";
+                string outputData = "";
 
-                if (data.Length <= 0) return outputData;
+                if (data.Length > 0)
+                {
+                    try
+                    {
 
-                try
-                {
-                    //Debug.Console(2, "ParseConsoleData Data: {0}, Line {1}, startStirng {2}, endString {3}", data, line, startString, endString);
-                    var linePosition = data.IndexOf(line, StringComparison.Ordinal);
-                    var startPosition = data.IndexOf(startString, linePosition, StringComparison.Ordinal) +
-                                        startString.Length;
-                    var endPosition = data.IndexOf(endString, startPosition, StringComparison.Ordinal);
-                    outputData = data.Substring(startPosition, endPosition - startPosition).Trim();
-                    //Debug.Console(2, "ParseConsoleData Return: {0}", outputData);
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, "Error Parsing Console Data:\r{0}", e);
+                        //Debug.Console(2, "ParseConsoleData Data: {0}, Line {1}, startStirng {2}, endString {3}", data, line, startString, endString);
+                        var linePosition = data.IndexOf(line);
+                        var startPosition = data.IndexOf(startString, linePosition) + startString.Length;
+                        var endPosition = data.IndexOf(endString, startPosition);
+                        outputData = data.Substring(startPosition, endPosition - startPosition).Trim();
+                        //Debug.Console(2, "ParseConsoleData Return: {0}", outputData);
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(1, "Error Parsing Console Data:\r{0}", e);
+                    }
                 }
 
                 return outputData;
             }
         }
+
     }
 
     /// <summary>
@@ -560,39 +330,32 @@ namespace PepperDash.Essentials.Core.Monitoring
         [JsonProperty("programNumber")]
         public uint ProgramNumber { get; private set; }
 
-        [JsonConverter(typeof (StringEnumConverter))]
+        [JsonConverter(typeof(StringEnumConverter))]
         [JsonProperty("operatingState")]
         public eProgramOperatingState OperatingState { get; set; }
 
-        [JsonConverter(typeof (StringEnumConverter))]
+        [JsonConverter(typeof(StringEnumConverter))]
         [JsonProperty("registrationState")]
         public eProgramRegistrationState RegistrationState { get; set; }
 
         [JsonProperty("programFile")]
         public string ProgramFile { get; set; }
-
         [JsonProperty("friendlyName")]
         public string FriendlyName { get; set; }
-
         [JsonProperty("compilerRevision")]
         public string CompilerRevision { get; set; }
-
         [JsonProperty("compileTime")]
         public string CompileTime { get; set; }
-
         [JsonProperty("include4Dat")]
         public string Include4Dat { get; set; }
 
         // SIMPL Windows properties
         [JsonProperty("systemName")]
         public string SystemName { get; set; }
-
         [JsonProperty("crestronDb")]
-        public string CrestronDb { get; set; }
-
+        public string CrestronDB { get; set; }
         [JsonProperty("environment")]
         public string Environment { get; set; }
-
         [JsonProperty("programmer")]
         public string Programmer { get; set; }
 
@@ -600,13 +363,10 @@ namespace PepperDash.Essentials.Core.Monitoring
         // SSP Properties
         [JsonProperty("applicationName")]
         public string ApplicationName { get; set; }
-
         [JsonProperty("programTool")]
         public string ProgramTool { get; set; }
-
         [JsonProperty("minFirmwareVersion")]
         public string MinFirmwareVersion { get; set; }
-
         [JsonProperty("plugInVersion")]
         public string PlugInVersion { get; set; }
 
@@ -621,7 +381,7 @@ namespace PepperDash.Essentials.Core.Monitoring
             Include4Dat = "";
 
             SystemName = "";
-            CrestronDb = "";
+            CrestronDB = "";
             Environment = "";
             Programmer = "";
 

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

@@ -132,13 +132,11 @@
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
-    <Compile Include="Devices\EssentialsDevice.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\ReconfigurableDevice.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
-    <Compile Include="Factory\IDeviceFactory.cs" />
     <Compile Include="Feedbacks\BoolFeedback.cs" />
     <Compile Include="Feedbacks\FeedbackCollection.cs" />
     <Compile Include="Feedbacks\FeedbackEventArgs.cs" />
@@ -158,9 +156,6 @@
     <Compile Include="Monitoring\SystemMonitorController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyController.cs" />
     <Compile Include="Microphone Privacy\MicrophonePrivacyControllerConfig.cs" />
-    <Compile Include="Plugins\PluginLoader.cs" />
-    <Compile Include="Presets\PresetBase.cs" />
-    <Compile Include="Plugins\IPluginDeviceFactory.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/IPluginDeviceConfig.cs

@@ -0,0 +1,11 @@
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.Plugins
+{
+    public interface IPluginDeviceConfig
+    {
+        string MinimumEssentialsFrameworkVersion { get; }
+        IKeyed BuildDevice(DeviceConfig dc);
+    }
+}

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

@@ -1,19 +0,0 @@
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines a class that is capable of loading custom plugin device types
-    /// </summary>
-    public interface IPluginDeviceFactory : IDeviceFactory
-    {
-        /// <summary>
-        /// Required to define the minimum version for Essentials in the format xx.yy.zz
-        /// </summary>
-        string MinimumEssentialsFrameworkVersion { get; }
-
-    }
-
-
-}

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

@@ -0,0 +1,19 @@
+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

@@ -1,493 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharp.Reflection;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials
-{
-    /// <summary>
-    /// Deals with loading plugins at runtime
-    /// </summary>
-    public static class PluginLoader
-    {
-        /// <summary>
-        /// The complete list of loaded assemblies. Includes Essentials Framework assemblies and plugins
-        /// </summary>
-        public static List<LoadedAssembly> LoadedAssemblies { get; private set; }
-
-        /// <summary>
-        /// The list of assemblies loaded from the plugins folder
-        /// </summary>
-        static List<LoadedAssembly> LoadedPluginFolderAssemblies;
-
-        /// <summary>
-        /// The directory to look in for .cplz plugin packages
-        /// </summary>
-        static string _pluginDirectory = Global.FilePathPrefix + "plugins";
-
-        /// <summary>
-        /// The directory where plugins will be moved to and loaded from
-        /// </summary>
-        static string _loadedPluginsDirectoryPath = _pluginDirectory + Global.DirectorySeparator + "loadedAssemblies";
-
-        // The temp directory where .cplz archives will be unzipped to
-        static string _tempDirectory = _pluginDirectory + Global.DirectorySeparator + "temp";
-
-
-        static PluginLoader()
-        {
-            LoadedAssemblies = new List<LoadedAssembly>();
-            LoadedPluginFolderAssemblies = new List<LoadedAssembly>();
-        }
-
-        /// <summary>
-        /// Retrieves all the loaded assemblies from the program directory
-        /// </summary>
-        public static void AddProgramAssemblies()
-        {
-            Debug.Console(2, "Getting Assemblies loaded with Essentials");
-            // Get the loaded assembly filenames
-            var appDi = new DirectoryInfo(Global.ApplicationDirectoryPathPrefix);
-            var assemblyFiles = appDi.GetFiles("*.dll");
-
-            Debug.Console(2, "Found {0} Assemblies", assemblyFiles.Length);
-
-            foreach (var fi in assemblyFiles)
-            {
-                string version = string.Empty;
-                Assembly assembly = null;
-
-                switch (fi.Name)
-                {
-                    case ("PepperDashEssentials.dll"):
-                        {
-                            version = Global.AssemblyVersion;
-                            assembly = Assembly.GetExecutingAssembly();
-                            break;
-                        }
-                    case ("PepperDashEssentialsBase.dll"):
-                        {
-
-                            break;
-                        }
-                    case ("PepperDash_Core.dll"):
-                        {
-                            version = PepperDash.Core.Debug.PepperDashCoreVersion;
-                            break;
-                        }
-                }
-
-                LoadedAssemblies.Add(new LoadedAssembly(fi.Name, version, assembly));
-            }
-
-            if (Debug.Level > 1)
-            {
-                Debug.Console(2, "Loaded Assemblies:");
-
-                foreach (var assembly in LoadedAssemblies)
-                {
-                    Debug.Console(2, "Assembly: {0}", assembly.Name);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Loads an assembly via Reflection and adds it to the list of loaded assemblies
-        /// </summary>
-        /// <param name="fileName"></param>
-        static LoadedAssembly LoadAssembly(string filePath)
-        {
-            Debug.Console(2, "Attempting to load {0}", filePath);
-            var assembly = Assembly.LoadFrom(filePath);
-            if (assembly != null)
-            {
-                var assyVersion = GetAssemblyVersion(assembly);
-
-                var loadedAssembly = new LoadedAssembly(assembly.GetName().Name, assyVersion, assembly);
-                LoadedAssemblies.Add(loadedAssembly);
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loaded assembly '{0}', version {1}", loadedAssembly.Name, loadedAssembly.Version);
-                return loadedAssembly;
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Unable to load assembly: '{0}'", filePath);
-            }
-
-            return null;
-
-        }
-
-        /// <summary>
-        /// Attempts to get the assembly informational version and if not possible gets the version
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        static string GetAssemblyVersion(Assembly assembly)
-        {
-            var ver = assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
-            if (ver != null && ver.Length > 0)
-            {
-                // Get the AssemblyInformationalVersion              
-                AssemblyInformationalVersionAttribute verAttribute = ver[0] as AssemblyInformationalVersionAttribute;
-                return verAttribute.InformationalVersion;
-            }
-            else
-            {
-                // Get the AssemblyVersion
-                var version = assembly.GetName().Version;
-                var verStr = string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
-                return verStr;
-            }
-        }
-
-        /// <summary>
-        /// Checks if the filename matches an already loaded assembly file's name
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <returns>True if file already matches loaded assembly file.</returns>
-        public static bool CheckIfAssemblyLoaded(string name)
-        {
-            Debug.Console(2, "Checking if assembly: {0} is loaded...", name);
-            var loadedAssembly = LoadedAssemblies.FirstOrDefault(s => s.Name.Equals(name));
-
-            if (loadedAssembly != null)
-            {
-                Debug.Console(2, "Assembly already loaded.");
-                return true;
-            }
-            else
-            {
-                Debug.Console(2, "Assembly not loaded.");
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Used by console command to report the currently loaded assemblies and versions
-        /// </summary>
-        /// <param name="command"></param>
-        public static void ReportAssemblyVersions(string command)
-        {
-            Debug.Console(0, "Loaded Assemblies:");
-            foreach (var assembly in LoadedAssemblies)
-            {
-                Debug.Console(0, "{0} Version: {1}", assembly.Name, assembly.Version);
-            }
-        }
-
-        /// <summary>
-        /// Moves any .dll assemblies not already loaded from the plugins folder to loadedPlugins folder
-        /// </summary>
-        static void MoveDllAssemblies()
-        {
-            Debug.Console(0, "Looking for .dll assemblies from plugins folder...");
-
-            var pluginDi = new DirectoryInfo(_pluginDirectory);
-            var pluginFiles = pluginDi.GetFiles("*.dll");
-
-            if (pluginFiles.Length > 0)
-            {
-                if (!Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    Directory.CreateDirectory(_loadedPluginsDirectoryPath);
-                }
-            }
-
-            foreach (var pluginFile in pluginFiles)
-            {
-                try
-                {
-                    Debug.Console(0, "Found .dll: {0}", pluginFile.Name);
-
-                    if (!CheckIfAssemblyLoaded(pluginFile.Name))
-                    {
-                        string filePath = string.Empty;
-
-                        filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + pluginFile.Name;
-
-                        // Check if there is a previous file in the loadedPlugins directory and delete
-                        if (File.Exists(filePath))
-                        {
-                            Debug.Console(0, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath);
-                            File.Delete(filePath);
-                        }
-
-                        // Move the file
-                        File.Move(pluginFile.FullName, filePath);
-                        Debug.Console(2, "Moved {0} to {1}", pluginFile.FullName, filePath);
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Skipping assembly: {0}.  There is already an assembly with that name loaded.", pluginFile.FullName);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, "Error with plugin file {0} . Exception: {1}", pluginFile.FullName, e);
-                    continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                }
-            }
-
-            Debug.Console(0, "Done with .dll assemblies");
-        }
-
-        /// <summary>
-        /// Unzips each .cplz archive into the temp directory and moves any unloaded files into loadedPlugins
-        /// </summary>
-        static void UnzipAndMoveCplzArchives()
-        {
-            Debug.Console(0, "Looking for .cplz archives from plugins folder...");
-            var di = new DirectoryInfo(_pluginDirectory);
-            var zFiles = di.GetFiles("*.cplz");
-
-            if (zFiles.Length > 0)
-            {
-                if (!Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    Directory.CreateDirectory(_loadedPluginsDirectoryPath);
-                }
-            }
-
-            foreach (var zfi in zFiles)
-            {
-                Directory.CreateDirectory(_tempDirectory);
-                var tempDi = new DirectoryInfo(_tempDirectory);
-
-                Debug.Console(0, "Found cplz: {0}. Unzipping into temp plugins directory", zfi.Name);
-                var result = CrestronZIP.Unzip(zfi.FullName, tempDi.FullName);
-                Debug.Console(0, "UnZip Result: {0}", result.ToString());
-
-                var tempFiles = tempDi.GetFiles("*.dll");
-                foreach (var tempFile in tempFiles)
-                {
-                    try
-                    {
-                        if (!CheckIfAssemblyLoaded(tempFile.Name))
-                        {
-                            string filePath = string.Empty;
-
-                            filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + tempFile.Name;
-
-                            // Check if there is a previous file in the loadedPlugins directory and delete
-                            if (File.Exists(filePath))
-                            {
-                                Debug.Console(0, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath);
-                                File.Delete(filePath);
-                            }
-
-                            // Move the file
-                            File.Move(tempFile.FullName, filePath);
-                            Debug.Console(2, "Moved {0} to {1}", tempFile.FullName, filePath);
-                        }
-                        else
-                        {
-                            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Skipping assembly: {0}.  There is already an assembly with that name loaded.", tempFile.FullName);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.Console(2, "Assembly {0} is not a custom assembly. Exception: {1}", tempFile.FullName, e);
-                        continue; //catching any load issues and continuing. There will be exceptions loading Crestron .dlls from the cplz Probably should do something different here
-                    }
-                }
-
-                // Delete the .cplz and the temp directory
-                Directory.Delete(_tempDirectory, true);
-                zfi.Delete();
-            }
-
-            Debug.Console(0, "Done with .cplz archives");
-        }
-
-        /// <summary>
-        /// Attempts to load the assemblies from the loadedPlugins folder
-        /// </summary>
-        static void LoadPluginAssemblies()
-        {
-            Debug.Console(0, "Loading assemblies from loadedPlugins folder...");
-            var pluginDi = new DirectoryInfo(_loadedPluginsDirectoryPath);
-            var pluginFiles = pluginDi.GetFiles("*.dll");
-
-            Debug.Console(2, "Found {0} plugin assemblies to load", pluginFiles.Length);
-
-            foreach (var pluginFile in pluginFiles)
-            {
-                var loadedAssembly = LoadAssembly(pluginFile.FullName);
-
-                LoadedPluginFolderAssemblies.Add(loadedAssembly);
-            }
-
-            Debug.Console(0, "All Plugins Loaded.");
-        }
-
-        /// <summary>
-        /// Iterate the loaded assemblies and try to call the LoadPlugin method
-        /// </summary>
-        static void LoadCustomPluginTypes()
-        {
-            Debug.Console(0, "Loading Custom Plugin Types...");
-            foreach (var loadedAssembly in LoadedPluginFolderAssemblies)
-            {
-                // iteratate this assembly's classes, looking for "LoadPlugin()" methods
-                try
-                {
-                    var assy = loadedAssembly.Assembly;
-                    var types = assy.GetTypes();
-                    foreach (var type in types)
-                    {
-                        try
-                        {
-                            if (typeof(IPluginDeviceFactory).IsAssignableFrom(type))
-                            {
-                                var plugin = (IPluginDeviceFactory)Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);
-                                LoadCustomPlugin(plugin, loadedAssembly);
-                            }
-                            else
-                            {
-                                var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Static);
-                                var loadPlugin = methods.FirstOrDefault(m => m.Name.Equals("LoadPlugin"));
-                                if (loadPlugin != null)
-                                {
-                                    LoadCustomLegacyPlugin(type, loadPlugin, loadedAssembly);
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            Debug.Console(2, "Load Plugin not found. {0} is not a plugin assembly. Exception: {1}", loadedAssembly.Name, e);
-                            continue;
-                        }
-
-                    }
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(2, "Error Loading Assembly: {0} Exception: (1) ", loadedAssembly.Name, e);
-                    continue;
-                }
-            }
-            // plugin dll will be loaded.  Any classes in plugin should have a static constructor
-            // that registers that class with the Core.DeviceFactory
-            Debug.Console(0, "Done Loading Custom Plugin Types.");
-        }
-
-        /// <summary>
-        /// Loads a
-        /// </summary>
-        /// <param name="plugin"></param>
-        static void LoadCustomPlugin(IPluginDeviceFactory plugin, LoadedAssembly loadedAssembly)
-        {
-            var passed = Global.IsRunningMinimumVersionOrHigher(plugin.MinimumEssentialsFrameworkVersion);
-
-            if (!passed)
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", plugin.MinimumEssentialsFrameworkVersion);
-                return;
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", plugin.MinimumEssentialsFrameworkVersion);
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading plugin: {0}", loadedAssembly.Name);
-            plugin.LoadTypeFactories();
-        }
-
-        /// <summary>
-        /// Loads a a custom plugin via the legacy method
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="loadPlugin"></param>
-        static void LoadCustomLegacyPlugin(CType type, MethodInfo loadPlugin, LoadedAssembly loadedAssembly)
-        {
-            Debug.Console(2, "LoadPlugin method found in {0}", type.Name);
-
-            var fields = type.GetFields(BindingFlags.Public | BindingFlags.Static);
-
-            var minimumVersion = fields.FirstOrDefault(p => p.Name.Equals("MinimumEssentialsFrameworkVersion"));
-            if (minimumVersion != null)
-            {
-                Debug.Console(2, "MinimumEssentialsFrameworkVersion found");
-
-                var minimumVersionString = minimumVersion.GetValue(null) as string;
-
-                if (!string.IsNullOrEmpty(minimumVersionString))
-                {
-                    var passed = Global.IsRunningMinimumVersionOrHigher(minimumVersionString);
-
-                    if (!passed)
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Error, "Plugin indicates minimum Essentials version {0}.  Dependency check failed.  Skipping Plugin", minimumVersionString);
-                        return;
-                    }
-                    else
-                    {
-                        Debug.Console(0, Debug.ErrorLogLevel.Notice, "Passed plugin passed dependency check (required version {0})", minimumVersionString);
-                    }
-                }
-                else
-                {
-                    Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion found but not set.  Loading plugin, but your mileage may vary.");
-                }
-            }
-            else
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Warning, "MinimumEssentialsFrameworkVersion not found.  Loading plugin, but your mileage may vary.");
-            }
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "Loading legacy plugin: {0}", loadedAssembly.Name);
-            loadPlugin.Invoke(null, null);
-
-        }
-
-        /// <summary>
-        /// Loads plugins
-        /// </summary>
-        public static void LoadPlugins()
-        {
-            if (Directory.Exists(_pluginDirectory))
-            {
-                Debug.Console(0, Debug.ErrorLogLevel.Notice, "Plugins directory found, checking for plugins");
-
-                // Deal with any .dll files
-                MoveDllAssemblies();
-
-                // Deal with any .cplz files
-                UnzipAndMoveCplzArchives();
-
-                if (Directory.Exists(_loadedPluginsDirectoryPath))
-                {
-                    // Load the assemblies from the loadedPlugins folder into the AppDomain
-                    LoadPluginAssemblies();
-
-                    // Load the types from any custom plugin assemblies
-                    LoadCustomPluginTypes();
-                }
-            }
-        }
-
-    }
-
-    /// <summary>
-    /// Represents an assembly loaded at runtime and it's associated metadata
-    /// </summary>
-    public class LoadedAssembly
-    {
-        public string Name { get; private set; }
-        public string Version { get; private set; }
-        public Assembly Assembly { get; private set; }
-
-        public LoadedAssembly(string name, string version, Assembly assembly)
-        {
-            Name = name;
-            Version = version;
-            Assembly = assembly;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Presets/PresetBase.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials.Core.Presets
-{
-    public class PresetBase
-    {
-        [JsonProperty("id")]
-        public int ID { get; set; }
-        /// <summary>
-        /// Used to store the name of the preset
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; set; }
-        /// <summary>
-        /// Indicates if the preset is defined(stored) in the codec
-        /// </summary>
-        [JsonProperty("defined")]
-        public bool Defined { get; set; }
-        /// <summary>
-        /// Indicates if the preset has the capability to be defined
-        /// </summary>
-        [JsonProperty("isDefinable")]
-        public bool IsDefinable { get; set; }
-
-        public PresetBase(int id, string description, bool def, bool isDef)
-        {
-            ID = id;
-            Description = description;
-            Defined = def;
-            IsDefinable = isDef;
-        }
-    }
-}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/EssentialsRoomBase.cs

@@ -173,8 +173,6 @@ namespace PepperDash.Essentials.Core
                 RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownPromptSeconds;
             else if (mode == eVacancyMode.InInitialVacancy)
                 RoomVacancyShutdownTimer.SecondsToCount = RoomVacancyShutdownSeconds;
-            else if (mode == eVacancyMode.InShutdownWarning)
-                RoomVacancyShutdownTimer.SecondsToCount = 60;
             VacancyMode = mode;
             RoomVacancyShutdownTimer.Start();
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Interfaces.cs

@@ -35,10 +35,9 @@ namespace PepperDash.Essentials.Core
     /// </summary>
     public interface IRunRouteAction
     {
-        void RunRouteAction(string routeKey, string sourceListKey);
-
-        void RunRouteAction(string routeKey, string sourceListKey, Action successCallback);
+        void RunRouteAction(string routeKey);
 
+        void RunRouteAction(string routeKey, Action successCallback);
     }
 
     /// <summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/IRoutingInputsExtensions.cs

@@ -0,0 +1,300 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public static class IRoutingInputsExtensions
+	{
+		/// <summary>
+		/// Gets any existing route for a destination, clears it, and then 
+		/// </summary>
+		public static void ReleaseAndMakeRoute(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType)
+		{
+			var sw = new Stopwatch();
+			sw.Start();
+
+			destination.ReleaseRoute();
+
+			if (source == null) return;
+			var newRoute = destination.GetRouteToSource(source, signalType);
+			if (newRoute == null) return;
+			RouteDescriptorCollection.DefaultCollection.AddRouteDescriptor(newRoute);
+			Debug.Console(2, destination, "Executing new route");
+			newRoute.ExecuteRoutes();
+			sw.Stop();
+			Debug.Console(2, destination, "Route took {0} ms", sw.ElapsedMilliseconds);
+		}
+
+		/// <summary>
+		/// Will release the existing route on the destination
+		/// </summary>
+		/// <param name="destination"></param>
+		/// <param name="signalType"></param>
+		public static void ReleaseRoute(this IRoutingInputs destination)
+		{
+			var current = RouteDescriptorCollection.DefaultCollection.RemoveRouteDescriptor(destination);
+			if (current != null)
+			{
+				Debug.Console(2, destination, "Releasing current route: {0}", current.Source.Key);
+				current.ReleaseRoutes();
+			}
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="device"></param>
+		/// <param name="targetSource"></param>
+		/// <param name="signalType"></param>
+		/// <returns></returns>
+		public static RouteDescriptor GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType)
+		{
+			var routeTable = new RouteDescriptor (source, destination, signalType);
+
+			Debug.Console(0, destination, "Attempting to build source route from {0}***", source.Key);
+			if (!destination.GetRouteToSource(source, null, null, signalType, 0, routeTable))
+				routeTable = null;
+
+			Debug.Console(0, destination, "Route{0} discovered ***", routeTable == null ? " NOT" : "");
+			return routeTable;
+		}
+
+		/// <summary>
+		/// The recursive part of this.  Will stop on each device, search its inputs for the 
+		/// desired source and if not found, invoke this function for the each input port
+		/// hoping to find the source.
+		/// </summary>
+		/// <param name="destination"></param>
+		/// <param name="source"></param>
+		/// <param name="onSuccessOutputPort"></param>
+		/// <param name="alreadyCheckedDevices"></param>
+		/// <param name="signalType"></param>
+		/// <param name="cycle"></param>
+		/// <param name="routeTable"></param>
+		/// <returns>true if source is hit</returns>
+		static bool GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source,
+			RoutingOutputPort onSuccessOutputPort, List<IRoutingInputsOutputs> alreadyCheckedDevices, 
+				eRoutingSignalType signalType, int cycle, RouteDescriptor routeTable)
+		{
+			cycle++;
+			Debug.Console(0, destination, "SelectInput-cycle {1}. Finding {2} route back to {0}", source.Key, cycle, signalType);
+			var destDevInputTies = TieLineCollection.Default.Where(t =>
+				t.DestinationPort.ParentDevice == destination && (t.Type == signalType || t.Type == eRoutingSignalType.AudioVideo));
+
+			// find a direct tie
+			var directTie = destDevInputTies.FirstOrDefault(
+				t => !(t.SourcePort.ParentDevice is IRoutingInputsOutputs) 
+					&& t.DestinationPort.ParentDevice == destination 
+					&& t.SourcePort.ParentDevice == source);
+			RoutingInputPort inputPort = null;
+			if (directTie != null) // Found a tie directly to the source
+			{
+				Debug.Console(0, destination, "Found direct tie to {0}**", source.Key);
+				inputPort = directTie.DestinationPort;
+			}
+			else // no direct-connect.  Walk back devices.
+			{
+				Debug.Console(0, destination, "is not directly connected to {0}. Walking down tie lines", source.Key);
+
+				// No direct tie? Run back out on the inputs' attached devices... 
+				// Only the ones that are routing devices
+				var attachedMidpoints = destDevInputTies.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
+				foreach (var inputTieToTry in attachedMidpoints)
+				{
+					Debug.Console(0, destination, "Trying to find route on {0}", inputTieToTry.SourcePort.ParentDevice.Key);
+					var upstreamDeviceOutputPort = inputTieToTry.SourcePort;
+					var upstreamRoutingDevice = upstreamDeviceOutputPort.ParentDevice as IRoutingInputsOutputs;
+					// Check if this previous device has already been walked
+					if (!(alreadyCheckedDevices != null && alreadyCheckedDevices.Contains(upstreamRoutingDevice)))
+					{
+						// haven't seen this device yet.  Do it.  Pass the output port to the next
+						// level to enable switching on success
+						var upstreamRoutingSuccess = upstreamRoutingDevice.GetRouteToSource(source, upstreamDeviceOutputPort, 
+							alreadyCheckedDevices, signalType, cycle, routeTable);
+						if (upstreamRoutingSuccess)
+						{
+							Debug.Console(0, destination, "Upstream device route found");
+							inputPort = inputTieToTry.DestinationPort;
+							break; // Stop looping the inputs in this cycle
+						}
+					}
+				}
+			}
+
+			// we have a route on corresponding inputPort. *** Do the route ***
+			if (inputPort != null) 
+			{
+				Debug.Console(0, destination, "adding route:");
+				if (onSuccessOutputPort == null)
+				{
+					// it's a sink device
+					routeTable.Routes.Add(new RouteSwitchDescriptor(inputPort));
+				}
+				else if (destination is IRouting)
+				{
+					routeTable.Routes.Add(new RouteSwitchDescriptor (onSuccessOutputPort, inputPort));
+				}
+				else // device is merely IRoutingInputOutputs
+					Debug.Console(0, destination, "    No routing. Passthrough device");
+				Debug.Console(0, destination, "Exiting cycle {0}", cycle);
+				return true;
+			}
+	
+			if(alreadyCheckedDevices == null)
+				alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
+			alreadyCheckedDevices.Add(destination as IRoutingInputsOutputs);
+
+			Debug.Console(0, destination, "No route found to {0}", source.Key);
+			return false;
+		}
+	}
+
+
+
+
+
+	// MOVE MOVE MOVE MOVE MOVE MOVE MOVE  MOVE MOVE MOVE MOVE MOVE MOVE MOVE  MOVE MOVE MOVE MOVE MOVE MOVE MOVE 
+
+
+	/// <summary>
+	/// A collection of routes - typically the global DefaultCollection is used
+	/// </summary>
+	public class RouteDescriptorCollection
+	{
+		public static RouteDescriptorCollection DefaultCollection
+		{
+			get
+			{
+				if (_DefaultCollection == null)
+					_DefaultCollection = new RouteDescriptorCollection();
+				return _DefaultCollection;
+			}
+		}
+		static RouteDescriptorCollection _DefaultCollection;
+
+		List<RouteDescriptor> RouteDescriptors = new List<RouteDescriptor>();
+
+		public void AddRouteDescriptor(RouteDescriptor descriptor)
+		{
+			if (RouteDescriptors.Any(t => t.Destination == descriptor.Destination))
+			{
+				Debug.Console(1, descriptor.Destination, 
+					"Route to [{0}] already exists in global routes table", descriptor.Source.Key);
+				return;
+			}
+			RouteDescriptors.Add(descriptor);
+		}
+
+		public RouteDescriptor GetRouteDescriptorForDestination(IRoutingInputs destination)
+		{
+			return RouteDescriptors.FirstOrDefault(rd => rd.Destination == destination);
+		}
+
+		/// <summary>
+		/// Returns the RouteDescriptor for a given destination and removes it from collection.
+		/// Returns null if no route with the provided destination exists.
+		/// </summary>
+		public RouteDescriptor RemoveRouteDescriptor(IRoutingInputs destination)
+		{
+			var descr = GetRouteDescriptorForDestination(destination);
+			if (descr != null)
+				RouteDescriptors.Remove(descr);
+			return descr;
+		}
+	}
+
+	/// <summary>
+	/// Represents an collection of individual route steps between Source and Destination
+	/// </summary>
+	public class RouteDescriptor
+	{
+		public IRoutingInputs Destination { get; private set; }
+		public IRoutingOutputs Source { get; private set; }
+		public eRoutingSignalType SignalType { get; private set; }
+		public List<RouteSwitchDescriptor> Routes { get; private set; }
+
+
+		public RouteDescriptor(IRoutingOutputs source, IRoutingInputs destination, eRoutingSignalType signalType)
+		{
+			Destination = destination;
+			Source = source;
+			SignalType = signalType;
+			Routes = new List<RouteSwitchDescriptor>();
+		}
+
+		public void ExecuteRoutes()
+		{
+			foreach (var route in Routes)
+			{
+				Debug.Console(2, route.ToString());
+				if (route.SwitchingDevice is IRoutingSinkWithSwitching)
+					(route.SwitchingDevice as IRoutingSinkWithSwitching).ExecuteSwitch(route.InputPort.Selector);
+				else if (route.SwitchingDevice is IRouting)
+				{
+					(route.SwitchingDevice as IRouting).ExecuteSwitch(route.InputPort.Selector, route.OutputPort.Selector, SignalType);
+					route.OutputPort.InUseTracker.AddUser(Destination, "destination");
+				}
+			}
+		}
+
+		public void ReleaseRoutes()
+		{
+			foreach (var route in Routes)
+			{
+				if (route.SwitchingDevice is IRouting)
+				{
+					// 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");
+				}
+			}
+		}
+
+		public override string ToString()
+		{
+			var routesText = Routes.Select(r => r.ToString()).ToArray();
+			return string.Format("Route table from {0} to {1}:\r{2}", Source.Key, Destination.Key, string.Join("\r", routesText));
+		}
+	}
+
+	/// <summary>
+	/// Represents an individual link for a route
+	/// </summary>
+	public class RouteSwitchDescriptor
+	{
+		public IRoutingInputs SwitchingDevice { get { return InputPort.ParentDevice; } }
+		public RoutingOutputPort OutputPort { get; set; }
+		public RoutingInputPort InputPort { get; set; }
+
+		public RouteSwitchDescriptor(RoutingInputPort inputPort)
+		{
+			InputPort = inputPort;
+		}
+
+		public RouteSwitchDescriptor(RoutingOutputPort outputPort, RoutingInputPort inputPort)
+		{
+			InputPort = inputPort;
+			OutputPort = outputPort;
+		}
+
+		public override string ToString()
+		{
+			if(OutputPort == null) // IRoutingSink
+				return string.Format("{0} switches to input '{1}'", SwitchingDevice.Key, InputPort.Selector);
+
+			return string.Format("{0} switches output '{1}' to input '{2}'", SwitchingDevice.Key, OutputPort.Selector, InputPort.Selector);
+		}
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/RoutingInterfaces.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	//*******************************************************************************************
+	// Interfaces
+
+	public interface IRoutingInputs : IKeyed
+	{
+		RoutingPortCollection<RoutingInputPort> InputPorts { get; }
+	}
+
+	public interface IRoutingOutputs : IKeyed
+	{
+		RoutingPortCollection<RoutingOutputPort> OutputPorts { get; }
+	}
+
+	/// <summary>
+	/// For fixed-source endpoint devices
+	/// </summary>
+	public interface IRoutingSinkNoSwitching : IRoutingInputs
+	{
+
+	}
+
+	public interface IRoutingSinkWithSwitching : IRoutingSinkNoSwitching
+	{
+		//void ClearRoute();
+		void ExecuteSwitch(object inputSelector);
+	}
+
+	/// <summary>
+	/// For devices like RMCs, baluns, other devices with no switching.
+	/// </summary>
+	public interface IRoutingInputsOutputs : IRoutingInputs, IRoutingOutputs
+	{
+	}
+
+	public interface IRouting : IRoutingInputsOutputs
+	{
+		//void ClearRoute(object outputSelector);
+		void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType);
+	}
+
+	public interface IRoutingSource : IRoutingOutputs
+	{
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/RoutingPort.cs

@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// Base class for RoutingInput and Output ports
+	/// </summary>
+	public abstract class RoutingPort : IKeyed
+	{
+		public string Key { get; private set; }
+		public eRoutingSignalType Type { get; private set; }
+		public eRoutingPortConnectionType ConnectionType { get; private set; }
+		public readonly object Selector;
+		public bool IsInternal { get; private set; }
+
+		public RoutingPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType, object selector, bool isInternal)
+		{
+			Key = key;
+			Type = type;
+			ConnectionType = connType;
+			Selector = selector;
+			IsInternal = IsInternal;
+		}
+	}
+
+	public enum eRoutingSignalType
+	{
+		Audio,
+		Video,
+		AudioVideo
+	}
+
+	public enum eRoutingPortConnectionType
+	{
+		None, BackplaneOnly, Hdmi, Rgb, Vga, LineAudio, DigitalAudio, Sdi, Composite, Component, DmCat, DmMmFiber, DmSmFiber
+	}
+
+	/// <summary>
+	/// Basic RoutingInput with no statuses.
+	/// </summary>
+	public class RoutingInputPort : RoutingPort
+	{
+		/// <summary>
+		/// The IRoutingInputs object this lives on
+		/// </summary>
+		public IRoutingInputs ParentDevice { get; private set; }
+
+		/// <summary>
+		/// Constructor for a basic RoutingInputPort
+		/// </summary>
+		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
+		/// May be string, number, whatever</param>
+		/// <param name="parent">The IRoutingInputs object this lives on</param>
+		public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
+			object selector, IRoutingInputs parent)
+			: this (key, type, connType, selector, parent, false)
+		{
+		}
+
+		/// <summary>
+		/// Constructor for a virtual routing input port that lives inside a device. For example
+		/// the ports that link a DM card to a DM matrix bus
+		/// </summary>
+		/// <param name="isInternal">true for internal ports</param>
+		public RoutingInputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
+			object selector, IRoutingInputs parent, bool isInternal)
+			: base(key, type, connType, selector, isInternal)
+		{
+			if (parent == null)
+				throw new ArgumentNullException("parent");
+			ParentDevice = parent;
+		}
+
+	}
+
+	/// <summary>
+	/// A RoutingInputPort for devices like DM-TX and DM input cards. 
+	/// Will provide video statistics on connected signals
+	/// </summary>
+	public class RoutingInputPortWithVideoStatuses : RoutingInputPort
+	{
+		/// <summary>
+		/// Video statuses attached to this port
+		/// </summary>
+		public VideoStatusOutputs VideoStatus { get; private set; }
+
+		/// <summary>
+		/// Constructor 
+		/// </summary>
+		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
+		/// May be string, number, whatever</param>
+		/// <param name="parent">The IRoutingInputs object this lives on</param>
+		/// <param name="funcs">A VideoStatusFuncsWrapper used to assign the callback funcs that will get 
+		/// the values for the various stats</param>
+		public RoutingInputPortWithVideoStatuses(string key, 
+			eRoutingSignalType type, eRoutingPortConnectionType connType, object selector, 
+			IRoutingInputs parent, VideoStatusFuncsWrapper funcs) :
+			base(key, type, connType, selector, parent)
+		{
+			VideoStatus = new VideoStatusOutputs(funcs);
+		}
+	}
+
+	public class RoutingOutputPort : RoutingPort
+	{
+		/// <summary>
+		/// The IRoutingOutputs object this port lives on
+		/// </summary>
+		public IRoutingOutputs ParentDevice { get; private set; }
+
+		public InUseTracking InUseTracker { get; private set; }
+
+
+		/// <summary>
+		/// </summary>
+		/// <param name="selector">An object used to refer to this port in the IRouting device's ExecuteSwitch method.
+		/// May be string, number, whatever</param>
+		/// <param name="parent">The IRoutingOutputs object this port lives on</param>
+		public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
+			object selector, IRoutingOutputs parent)
+			: this(key, type, connType, selector, parent, false)
+		{
+		}
+
+		public RoutingOutputPort(string key, eRoutingSignalType type, eRoutingPortConnectionType connType,
+			object selector, IRoutingOutputs parent, bool isInternal)
+			: base(key, type, connType, selector, isInternal)
+		{
+			if (parent == null)
+				throw new ArgumentNullException("parent");
+			ParentDevice = parent;
+			InUseTracker = new InUseTracking();
+		}
+
+		public override string ToString()
+		{
+			return ParentDevice.Key + ":" + Key;
+		}
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/RoutingPortCollection.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// Basically a List , with an indexer to find ports by key name
+	/// </summary>
+	public class RoutingPortCollection<T> : List<T> where T: RoutingPort
+	{
+		/// <summary>
+		/// Case-insensitive port lookup linked to ports' keys
+		/// </summary>
+		public T this[string key] 
+		{
+			get
+			{
+				return this.FirstOrDefault(i => i.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+			}
+		}
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing-CHECK REMOVE/TieLine.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+	public class TieLine
+	{
+		public RoutingOutputPort SourcePort { get; private set; }
+		public RoutingInputPort DestinationPort { get; private set; }
+		public int InUseCount { get { return DestinationUsingThis.Count; } }
+
+		/// <summary>
+		/// Gets the type of this tie line.  Will either be the type of the desination port
+		/// or the type of OverrideType when it is set.
+		/// </summary>
+		public eRoutingSignalType Type
+		{
+			get
+			{
+				if (OverrideType.HasValue) return OverrideType.Value;
+				return DestinationPort.Type;
+			}
+		}
+
+		/// <summary>
+		/// Use this to override the Type property for the destination port. For example,
+		/// when the tie line is type AudioVideo, and the signal flow should be limited to
+		/// Audio-only or Video only, changing this type will alter the signal paths
+		/// available to the routing algorithm without affecting the actual Type
+		/// of the destination port.
+		/// </summary>
+		public eRoutingSignalType? OverrideType { get; set; }
+
+		List<IRoutingInputs> DestinationUsingThis = new List<IRoutingInputs>();
+
+		/// <summary>
+		/// For tie lines that represent internal links, like from cards to the matrix in a DM.
+		/// This property is true if SourcePort and DestinationPort IsInternal
+		/// property are both true
+		/// </summary>
+		public bool IsInternal { get { return SourcePort.IsInternal && DestinationPort.IsInternal; } }
+		public bool TypeMismatch { get { return SourcePort.Type != DestinationPort.Type; } }
+		public bool ConnectionTypeMismatch { get { return SourcePort.ConnectionType != DestinationPort.ConnectionType; } }
+		public string TypeMismatchNote { get; set; }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="sourcePort"></param>
+		/// <param name="destinationPort"></param>
+		public TieLine(RoutingOutputPort sourcePort, RoutingInputPort destinationPort)
+		{
+			if (sourcePort == null || destinationPort == null)
+				throw new ArgumentNullException("source or destination port");
+			SourcePort = sourcePort;
+			DestinationPort = destinationPort;
+		}
+
+		/// <summary>
+		/// Creates a tie line with an overriding Type.  See help for OverrideType property for info
+		/// </summary>
+		/// <param name="overrideType">The signal type to limit the link to. Overrides DestinationPort.Type</param>
+		public TieLine(RoutingOutputPort sourcePort, RoutingInputPort destinationPort, eRoutingSignalType overrideType) :
+			this(sourcePort, destinationPort)
+		{
+			OverrideType = overrideType;
+		}
+
+		public static TieLine TieLineFromStrings(string sourceKey, string sourcePortKey, string destinationKey, string destinationPortKey)
+		{
+			var sourceDev = DeviceManager.GetDeviceForKey(sourceKey) as IRoutingOutputs;
+			if (sourceDev == null)
+			{
+				Debug.Console(1, "WARNING: Cannot create tie line, routable source '{0}' not found", sourceKey);
+				return null;
+			}
+			var destDev = DeviceManager.GetDeviceForKey(destinationKey) as IRoutingInputs;
+			if (destDev == null)
+			{
+				Debug.Console(1, "WARNING: Cannot create tie line, routable destination '{0}' not found", destinationKey);
+				return null;
+			}
+			var sourcePort = sourceDev.OutputPorts[sourcePortKey];
+			if (sourcePort == null)
+			{
+				Debug.Console(1, "WARNING: Cannot create tie line. Source '{0}' does not contain port '{1}'", sourceKey, sourcePortKey);
+				return null;
+			}
+			var destPort = destDev.InputPorts[destinationPortKey];
+			if (destPort == null)
+			{
+				Debug.Console(1, "WARNING: Cannot create tie line. Destination '{0}' does not contain port '{1}'", destinationKey, destinationPortKey);
+				return null;
+			}
+
+			return new TieLine(sourcePort, destPort);
+		}
+
+		/// <summary>
+		/// Will link up video status from supporting inputs to connected outputs
+		/// </summary>
+		public void Activate()
+		{
+			// Now does nothing
+		}
+
+		public void Deactivate()
+		{
+			// Now does nothing
+		}
+
+		public override string ToString()
+		{
+			return string.Format("Tie line: [{0}]{1} --> [{2}]{3}", SourcePort.ParentDevice.Key, SourcePort.Key,
+				DestinationPort.ParentDevice.Key, DestinationPort.Key);
+		}
+	}
+
+
+	//********************************************************************************
+
+	public class TieLineCollection : List<TieLine>
+	{
+		public static TieLineCollection Default
+		{
+			get
+			{
+				if (_Default == null)
+					_Default = new TieLineCollection();
+				return _Default;
+			}
+		}
+		static TieLineCollection _Default;
+	}
+}

essentials-framework/Essentials Core/PepperDashEssentialsBase/Touchpanels/Mpc3Touchpanel.cs

@@ -28,6 +28,7 @@ namespace PepperDash.Essentials.Core.Touchpanels
 
             _Touchpanel.ButtonStateChange += new Crestron.SimplSharpPro.DeviceSupport.ButtonEventHandler(_Touchpanel_ButtonStateChange);
 
+
             AddPostActivationAction(() =>
                 {
                     // Link up the button feedbacks to the specified BoolFeedbacks
@@ -39,7 +40,7 @@ namespace PepperDash.Essentials.Core.Touchpanels
                         {
                             var bKey = button.Key.ToLower();
 
-                            var feedback = device.GetFeedbackProperty(feedbackConfig.FeedbackName);
+                            var feedback = device.GetFeedbackProperty(feedbackConfig.BoolFeedbackName);
 
                             var bFeedback = feedback as BoolFeedback;
                             var iFeedback = feedback as IntFeedback;
@@ -71,7 +72,7 @@ namespace PepperDash.Essentials.Core.Touchpanels
                             }
                             else
                             {
-                                Debug.Console(1, this, "Unable to get BoolFeedback with name: {0} from device: {1}", feedbackConfig.FeedbackName, device.Key);
+                                Debug.Console(1, this, "Unable to get BoolFeedback with name: {0} from device: {1}", feedbackConfig.BoolFeedbackName, device.Key);
                             }
                         }
                         else
@@ -139,6 +140,6 @@ namespace PepperDash.Essentials.Core.Touchpanels
     public class KeypadButtonFeedback
     {
         public string DeviceKey { get; set; }
-        public string FeedbackName { get; set; }
+        public string BoolFeedbackName { get; set; }
     }
 }

essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj

@@ -84,7 +84,7 @@
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs

@@ -2,16 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.Reflection;
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Devices.Common.Codec;
+using System.Text.RegularExpressions;
+using Crestron.SimplSharp.Reflection;
 
-using Newtonsoft.Json;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
@@ -24,16 +21,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         Focus = 8
     }
 
-    public abstract class CameraBase : Device, IRoutingOutputs
+	public abstract class CameraBase : Device
 	{
-        public eCameraControlMode ControlMode { get; protected set; }
-
-        #region IRoutingOutputs Members
-
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; protected set; }
-
-        #endregion
-
         public bool CanPan
         {
             get
@@ -70,37 +59,14 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
         protected eCameraCapabilities Capabilities { get; set; }
 
 		public CameraBase(string key, string name) :
-			base(key, name) 
-        {
-            OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
-
-            ControlMode = eCameraControlMode.Manual;
-        }		
+			base(key, name) { }		
 	}
 
-    public class CameraPreset : PresetBase
-    {
-        public CameraPreset(int id, string description, bool isDefined, bool isDefinable)
-            : base(id, description, isDefined, isDefinable)
-        {
-
-        }
-    }
-
-
 	public class CameraPropertiesConfig
 	{
 		public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
 
 		public ControlPropertiesConfig Control { get; set; }
 
-        [JsonProperty("supportsAutoMode")]
-        public bool SupportsAutoMode { get; set; }
-
-        [JsonProperty("supportsOffMode")]
-        public bool SupportsOffMode { get; set; }
-
-        [JsonProperty("presets")]
-        public List<CameraPreset> Presets { get; set; }
 	}
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraControl.cs

@@ -9,9 +9,9 @@ using PepperDash.Essentials.Core;
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
     public enum eCameraControlMode
-    {       
-        Manual = 0,
-        Off,
+    {
+        Off = 0,
+        Manual,
         Auto
     }
 
@@ -88,8 +88,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraPanControl
     {
-        // void PanLeft(bool pressRelease);
-        // void PanRight(bool pressRelease);
         void PanLeft();
         void PanRight();
         void PanStop();
@@ -100,8 +98,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraTiltControl
     {
-        // void TiltDown(bool pressRelease);
-        // void TildUp(bool pressRelease);
         void TiltDown();
         void TiltUp();
         void TiltStop();
@@ -112,8 +108,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
     /// </summary>
     public interface IHasCameraZoomControl
     {
-        // void ZoomIn(bool pressRelease);
-        // void ZoomOut(bool pressRelease);
         void ZoomIn();
         void ZoomOut();
         void ZoomStop();

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraVisca.cs

@@ -11,7 +11,7 @@ using Crestron.SimplSharp.Reflection;
 
 namespace PepperDash.Essentials.Devices.Common.Cameras
 {
-	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IPower
+	public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor
 	{
 		public IBasicCommunication Communication { get; private set; }
 		public CommunicationGather PortGather { get; private set; }
@@ -25,14 +25,11 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 		public bool PowerIsOn { get; private set; }
 
 		byte[] IncomingBuffer = new byte[] { };
-		public BoolFeedback PowerIsOnFeedback  { get; private set; }
+		public BoolFeedback PowerIsOnFeedback  { get; private set; } 
 
 		public CameraVisca(string key, string name, IBasicCommunication comm, CameraPropertiesConfig props) :
 			base(key, name)
 		{
-            Presets = props.Presets;
-
-            OutputPorts.Add(new RoutingOutputPort("videoOut", eRoutingSignalType.Video, eRoutingPortConnectionType.None, null, this, true));
 
             // Default to all capabilties
             Capabilities = eCameraCapabilities.Pan | eCameraCapabilities.Tilt | eCameraCapabilities.Zoom | eCameraCapabilities.Focus; 
@@ -135,15 +132,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 		{
 			SendBytes(new Byte[] {0x81, 0x01, 0x04, 0x00, 0x03, 0xFF});
 		}
-
-        public void PowerToggle()
-        {
-            if (PowerIsOnFeedback.BoolValue)
-                PowerOff();
-            else
-                PowerOn();
-        }
-
 		public void PanLeft() 
 		{
 			SendPanTiltCommand(new byte[] {0x01, 0x03});
@@ -218,22 +206,5 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
 			SendBytes(new byte[] { 0x81, 0x01, 0x04, 0x3F, 0x01, (byte)presetNumber, 0xFF });
 		}
 
-        #region IHasCameraPresets Members
-
-        public event EventHandler<EventArgs> PresetsListHasChanged;
-
-        public List<CameraPreset> Presets { get; private set; }
-
-        public void PresetSelect(int preset)
-        {
-            RecallPreset(preset);
-        }
-
-        public void PresetStore(int preset, string description)
-        {
-            SavePreset(preset);
-        }
-
-        #endregion
-    }
+	}
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/IHasCameraPresets.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Devices.Common.Cameras
-{
-    /// <summary>
-    /// Describes a camera with preset functionality
-    /// </summary>
-    public interface IHasCameraPresets
-    {
-        event EventHandler<EventArgs> PresetsListHasChanged;
-
-        List<CameraPreset> Presets { get; }
-
-        void PresetSelect(int preset);
-
-        void PresetStore(int preset, string description);
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/BiampTesira/BiampTesiraForteDspLevel.cs

@@ -10,19 +10,6 @@ using System.Text.RegularExpressions;
 
 namespace PepperDash.Essentials.Devices.Common.DSP
 {
-    public interface IBiampTesiraDspLevelControl : IBasicVolumeWithFeedback
-    {
-        /// <summary>
-        /// In BiAmp: Instance Tag, QSC: Named Control, Polycom: 
-        /// </summary>
-        string ControlPointTag { get; }
-        int Index1 { get; }
-        int Index2 { get; }
-        bool HasMute { get; }
-        bool HasLevel { get; }
-        bool AutomaticUnmuteOnVolumeUp { get; }
-    }
-
     public class TesiraForteLevelControl : TesiraForteControlPoint, IBiampTesiraDspLevelControl, IKeyed
     {
         bool _IsMuted;

essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs

@@ -56,4 +56,19 @@ namespace PepperDash.Essentials.Devices.Common.DSP
 	// ATC
 	// Mics, unusual
 
+    public interface IBiampTesiraDspLevelControl : IBasicVolumeWithFeedback
+    {
+        /// <summary>
+        /// In BiAmp: Instance Tag, QSC: Named Control, Polycom: 
+        /// </summary>
+        string ControlPointTag { get; }
+		int Index1 { get; }
+        int Index2 { get; }
+        bool HasMute { get; }
+        bool HasLevel { get; }
+        bool AutomaticUnmuteOnVolumeUp { get; }
+    }
+
+
+
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -102,7 +102,6 @@
     <Compile Include="AudioCodec\MockAC\MockAcPropertiesConfig.cs" />
     <Compile Include="Cameras\CameraBase.cs" />
     <Compile Include="Cameras\CameraVisca.cs" />
-    <Compile Include="Cameras\IHasCameraPresets.cs" />
     <Compile Include="Codec\eCodecCallDirection.cs" />
     <Compile Include="Codec\eCodecCallType.cs" />
     <Compile Include="Codec\eCodecCallStatus.cs" />
@@ -115,7 +114,6 @@
     <Compile Include="Power Controllers\DigitalLoggerPropertiesConfig.cs" />
     <Compile Include="ImageProcessors\AnalogWay\AnalongWayLiveCore.cs" />
     <Compile Include="ImageProcessors\AnalogWay\AnalogWayLiveCorePropertiesConfig.cs" />
-    <Compile Include="SoftCodec\BlueJeansPc.cs" />
     <Compile Include="VideoCodec\CiscoCodec\CiscoCamera.cs" />
     <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
     <Compile Include="Cameras\CameraControl.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs

@@ -129,27 +129,22 @@ namespace PepperDash.Essentials.Devices.Common
 				return new Core.Devices.Laptop(key, name);
 			}
 
-            else if (typeName == "bluejeanspc")
-            {
-                return new SoftCodec.BlueJeansPc(key, name);
-            }
+			else if (typeName == "mockvc")
+			{
+				return new VideoCodec.MockVC(dc);
+			}
 
-            else if (typeName == "mockvc")
-            {
-                return new VideoCodec.MockVC(dc);
-            }
+			else if (typeName == "mockac")
+			{
+				var props = JsonConvert.DeserializeObject<AudioCodec.MockAcPropertiesConfig>(properties.ToString());
+				return new AudioCodec.MockAC(key, name, props);
+			}
 
-            else if (typeName == "mockac")
-            {
-                var props = JsonConvert.DeserializeObject<AudioCodec.MockAcPropertiesConfig>(properties.ToString());
-                return new AudioCodec.MockAC(key, name, props);
-            }
-
-            else if (typeName.StartsWith("ciscospark"))
-            {
-                var comm = CommFactory.CreateCommForDevice(dc);
-                return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
-            }
+			else if (typeName.StartsWith("ciscospark"))
+			{
+				var comm = CommFactory.CreateCommForDevice(dc);
+				return new VideoCodec.Cisco.CiscoSparkCodec(dc, comm);
+			}
 
             else if (typeName == "zoomroom")
             {

essentials-framework/Essentials Devices Common/Essentials Devices Common/SoftCodec/BlueJeansPc.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Routing;
-using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Core.Config;
-
-
-namespace PepperDash.Essentials.Devices.Common.SoftCodec
-{
-    public class BlueJeansPc : InRoomPc, IRoutingInputs, IRunRouteAction, IRoutingSinkNoSwitching
-    {
-
-        public RoutingInputPort AnyVideoIn { get; private set; }
-
-        #region IRoutingInputs Members
-
-        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-        #endregion
-
-        public BlueJeansPc(string key, string name)
-            : base(key, name)
-        {
-            InputPorts = new RoutingPortCollection<RoutingInputPort>();
-            InputPorts.Add(AnyVideoIn = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.None, 0, this));
-        }
-
-        #region IRunRouteAction Members
-
-        public void RunRouteAction(string routeKey, string sourceListKey)
-        {
-            RunRouteAction(routeKey, sourceListKey, null);
-        }
-
-        public void RunRouteAction(string routeKey, string sourceListKey, Action successCallback)
-        {
-            CrestronInvoke.BeginInvoke(o =>
-                {
-                    Debug.Console(1, this, "Run route action '{0}' on SourceList: {1}", routeKey, sourceListKey);
-
-                    var dict = ConfigReader.ConfigObject.GetSourceListForKey(sourceListKey);
-                    if (dict == null)
-                    {
-                        Debug.Console(1, this, "WARNING: Config source list '{0}' not found", sourceListKey);
-                        return;
-                    }
-
-                    // Try to get the list item by it's string key
-                    if (!dict.ContainsKey(routeKey))
-                    {
-                        Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'",
-                            routeKey, sourceListKey);
-                        return;
-                    }
-
-                    var item = dict[routeKey];
-
-                    foreach (var route in item.RouteList)
-                    {
-                        DoRoute(route);
-                    }
-
-                    // store the name and UI info for routes
-                    if (item.SourceKey == "none")
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = null;
-                    }
-                    else if (item.SourceKey != null)
-                    {
-                        CurrentSourceInfoKey = routeKey;
-                        CurrentSourceInfo = item;
-                    }
-
-                    // report back when done
-                    if (successCallback != null)
-                        successCallback();
-                });
-        }
-
-        #endregion
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="route"></param>
-        /// <returns></returns>
-        bool DoRoute(SourceRouteListItem route)
-        {
-            IRoutingSinkNoSwitching dest = null;
-
-            dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching;
-
-            if (dest == null)
-            {
-                Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
-                return false;
-            }
-
-            if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
-            {
-                dest.ReleaseRoute();
-                if (dest is IPower)
-                    (dest as IPower).PowerOff();
-            }
-            else
-            {
-                var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
-                if (source == null)
-                {
-                    Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
-                    return false;
-                }
-                dest.ReleaseAndMakeRoute(source, route.Type);
-            }
-            return true;
-        }
-
-
-
-        #region IHasCurrentSourceInfoChange Members
-
-        public string CurrentSourceInfoKey { get; set; }
-
-        /// <summary>
-        /// The SourceListItem last run - containing names and icons 
-        /// </summary>
-        public SourceListItem CurrentSourceInfo
-        {
-            get { return _CurrentSourceInfo; }
-            set
-            {
-                if (value == _CurrentSourceInfo) return;
-
-                var handler = CurrentSourceChange;
-                // remove from in-use tracker, if so equipped
-                if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-                    (_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.RemoveUser(this, "control");
-
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.WillChange);
-
-                _CurrentSourceInfo = value;
-
-                // add to in-use tracking
-                if (_CurrentSourceInfo != null && _CurrentSourceInfo.SourceDevice is IInUseTracking)
-                    (_CurrentSourceInfo.SourceDevice as IInUseTracking).InUseTracker.AddUser(this, "control");
-                if (handler != null)
-                    handler(_CurrentSourceInfo, ChangeType.DidChange);
-            }
-        }
-        SourceListItem _CurrentSourceInfo;
-
-        public event SourceInfoChangeHandler CurrentSourceChange;
-
-        #endregion
-    }
-}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs

@@ -7,7 +7,6 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 
 using PepperDash.Core;
-using PepperDash.Essentials.Core.Presets;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
@@ -68,14 +67,34 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
     }
 
     /// <summary>
-    /// Represents a room preset on a video codec.  Typically stores camera position(s) and video routing.  Can be recalled by Far End if enabled.
+    /// Represents a room preset on a video coded.  Typically stores camera position(s) and video routing.  Can be recalled by Far End if enabled.
     /// </summary>
-    public class CodecRoomPreset : PresetBase
+    public class CodecRoomPreset
     {
-        public CodecRoomPreset(int id, string description, bool def, bool isDef)
-            : base(id, description, def, isDef)
-        {
+        [JsonProperty("id")]
+        public int ID { get; set; }
+        /// <summary>
+        /// Used to store the name of the preset
+        /// </summary>
+        [JsonProperty("description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// Indicates if the preset is defined(stored) in the codec
+        /// </summary>
+        [JsonProperty("defined")]
+        public bool Defined { get; set; }
+        /// <summary>
+        /// Indicates if the preset has the capability to be defined
+        /// </summary>
+        [JsonProperty("isDefinable")]
+        public bool IsDefinable { get; set; }
 
+        public CodecRoomPreset(int id, string description, bool def, bool isDef)
+        {
+            ID = id;
+            Description = description;
+            Defined = def;
+            IsDefinable = isDef;
         }
     }
 }