Merge branch 'bugfix/SystemMonitor-IndexOutOfRange' of https://github.com/PepperDash/Essentials into bugfix/SystemMonitor-IndexOutOfRange

Testing for #368

.github/scripts/ZipBuildOutput.ps1

@@ -10,7 +10,7 @@ Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
-Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll" | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {
   $allowed = $true;
   # Exclude any files in submodules
   foreach ($exclude in $exclusions) {

.github/workflows/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#332848",
+    "titleBar.activeBackground": "#483764",
+    "titleBar.activeForeground": "#FBFBFD"
+  }
+}

.github/workflows/docker.yml

@@ -32,7 +32,20 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          submodules: true
+      # And any submodules
+      #- name: Checkout submodules
+      #  shell: bash
+      #  run: |
+      #    git config --global url."https://github.com/".insteadOf "git@github.com:"
+      #    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+      #    git submodule sync --recursive
+      #    git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
         # Fetch all tags
       - name: Fetch tags
         run: git fetch --tags
@@ -58,7 +71,7 @@ jobs:
       - name: Build Solution
         shell: powershell
         run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder:v1.4.1 c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
+          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
       # Zip up the output files as needed
       - name: Zip Build Output
         shell: powershell
@@ -107,6 +120,49 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - 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
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - 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
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   # This step always runs and pushes the build to the internal build rep
   Internal_Push_Output:
     needs: Build_Project

.github/workflows/main.yml

@@ -25,13 +25,19 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
       # And any submodules
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          git config --global url."https://github.com/".insteadOf "git@github.com:"
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      #- name: Checkout submodules
+      #  shell: bash
+      #  run: |
+      #    git config --global url."https://github.com/".insteadOf "git@github.com:"
+      #    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+      #    git submodule sync --recursive
+      #    git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: restore Nuget Packages
+        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
       # Generate the appropriate version number
       - name: Set Version Number
         shell: powershell
@@ -85,6 +91,49 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Push_Nuget_Package:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - 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
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - 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
+      - name: Add nuget.exe
+        uses: nuget/setup-nuget@v1
+      - name: Add Github Packages source
+        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
+      - name: Add nuget.org API Key
+        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
+      - name: Create nuget package
+        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
+      - name: Publish nuget package to Github registry
+        run: nuget push **/*.nupkg -source github
+      - name: Publish nuget package to nuget.org
+        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
   Internal_Push_Output:
     needs: Build_Project
     runs-on: windows-latest

.gitignore

@@ -23,5 +23,7 @@ SIMPLSharpLogs/
 *.projectinfo
 essentials-framework/EssentialDMTestConfig/
 output/
+packages/
+
 
 PepperDashEssentials-0.0.0-buildType-test.zip

PepperDashEssentials/ControlSystem.cs

@@ -53,7 +53,7 @@ namespace PepperDash.Essentials
 
             if (Debug.DoNotLoadOnNextBoot)
             {
-                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
+                CrestronConsole.AddNewConsoleCommand(s => GoWithLoadDeferred(), "go", "Loads configuration file",
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
@@ -91,15 +91,23 @@ namespace PepperDash.Essentials
             }, "portalinfo", "Shows portal URLS from configuration", ConsoleAccessLevelEnum.AccessOperator);
 
 
+            CrestronConsole.AddNewConsoleCommand(DeviceManager.GetRoutingPorts,
+                "getroutingports", "Reports all routing ports, if any.  Requires a device key", ConsoleAccessLevelEnum.AccessOperator);
+
             if (!Debug.DoNotLoadOnNextBoot)
             {
-                GoWithLoad();
+                GoWithLoad(null);
                 return;
             }
 
             SystemMonitor.ProgramInitialization.ProgramInitializationComplete = true;
         }
 
+        private void GoWithLoadDeferred()
+        {
+            CrestronInvoke.BeginInvoke(GoWithLoad);
+        }
+
         /// <summary>
         /// Determines if the program is running on a processor (appliance) or server (VC-4).
         /// 
@@ -172,7 +180,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Begins the process of loading resources including plugins and configuration data
         /// </summary>
-        public void GoWithLoad()
+        public void GoWithLoad(object notUsed)
         {
             try
             {

PepperDashEssentials/PepperDashEssentials.csproj

@@ -71,9 +71,9 @@
       <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -155,7 +155,6 @@
     <Compile Include="UIDrivers\Environment Drivers\EssentialsShadeDriver.cs" />
     <Compile Include="UIDrivers\Essentials\EssentialsHeaderDriver.cs" />
     <Compile Include="UIDrivers\JoinedSigInterlock.cs" />
-    <Compile Include="UIDrivers\ScreenSaverController.cs" />
     <Compile Include="UIDrivers\SigInterlock.cs" />
     <Compile Include="UIDrivers\EssentialsHuddleVTC\EssentialsHuddlePresentationUiDriver.cs" />
     <Compile Include="UIDrivers\EssentialsHuddle\EssentialsHuddleTechPageDriver.cs" />

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -156,10 +156,7 @@ namespace PepperDash.Essentials.Room.Config
 		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
 
 		[JsonProperty("logo")]
-		public EssentialsLogoPropertiesConfig LogoLight { get; set; }
-
-        [JsonProperty("logoDark")]
-        public EssentialsLogoPropertiesConfig LogoDark { get; set; }
+		public EssentialsLogoPropertiesConfig Logo { get; set; }
 	
 		[JsonProperty("microphonePrivacy")]
 		public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
@@ -184,12 +181,6 @@ namespace PepperDash.Essentials.Room.Config
 
 		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
 		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
-
-        public EssentialsRoomPropertiesConfig()
-        {
-            LogoLight = new EssentialsLogoPropertiesConfig();
-            LogoDark = new EssentialsLogoPropertiesConfig();
-        }
 	}
 
     public class EssentialsAvRoomPropertiesConfig : EssentialsRoomPropertiesConfig
@@ -289,7 +280,7 @@ namespace PepperDash.Essentials.Room.Config
         /// <summary>
         /// Gets either the custom URL, a local-to-processor URL, or null if it's a default logo
         /// </summary>
-        public string GetLogoUrlLight()
+        public string GetUrl()
         {
             if (Type == "url")
                 return Url;
@@ -298,16 +289,6 @@ namespace PepperDash.Essentials.Room.Config
                     CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
             return null;
         }
-
-        public string GetLogoUrlDark()
-        {
-            if (Type == "url")
-                return Url;
-            if (Type == "system")
-                return string.Format("http://{0}:8080/logo-dark.png",
-                    CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
-            return null;
-        }
     }
 
     /// <summary>

PepperDashEssentials/Room/Types/EssentialsDualDisplayRoom.cs

@@ -327,8 +327,7 @@ namespace PepperDash.Essentials
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
                     IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
-            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
+            this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -250,8 +250,7 @@ namespace PepperDash.Essentials
                 this.SetRoomOccupancy(DeviceManager.GetDeviceForKey(PropertiesConfig.Occupancy.DeviceKey) as
                     IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
 
-            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
+            this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);

PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs

@@ -340,9 +340,7 @@ namespace PepperDash.Essentials
                     IOccupancyStatusProvider, PropertiesConfig.Occupancy.TimeoutMinutes);
             }
 
-            this.LogoUrlLightBkgnd = PropertiesConfig.LogoLight.GetLogoUrlLight();
-            this.LogoUrlDarkBkgnd = PropertiesConfig.LogoDark.GetLogoUrlDark();
-
+            this.LogoUrl = PropertiesConfig.Logo.GetUrl();
             this.SourceListKey = PropertiesConfig.SourceListKey;
             this.DefaultSourceItem = PropertiesConfig.DefaultSourceItem;
             this.DefaultVolume = (ushort)(PropertiesConfig.Volumes.Master.Level * 65535 / 100);

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -224,8 +224,6 @@ namespace PepperDash.Essentials
                 var room = DeviceManager.GetDeviceForKey(props.DefaultRoomKey);
                 if (room is EssentialsHuddleSpaceRoom)
                 {
-                    // Screen Saver Driver
-                    mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
 
                     // Header Driver
                     Debug.Console(0, panelController, "Adding header driver");
@@ -274,9 +272,6 @@ namespace PepperDash.Essentials
                 {
                     Debug.Console(0, panelController, "Adding huddle space VTC AV driver");
 
-                    // Screen Saver Driver
-                    mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, props);
-
                     // Header Driver
                     mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, props);
 

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -146,10 +146,6 @@ namespace PepperDash.Essentials
         /// </summary>
         public const uint RoomPhoneText = 3904;
         /// <summary>
-        /// 3905 - Video address/number for room header
-        /// </summary>
-        public const uint RoomVideoAddressText = 3905;
-        /// <summary>
         /// 3906 - The separator for verbose-header text on addresses
         /// </summary>
         public const uint RoomAddressPipeText = 3906;
@@ -158,14 +154,6 @@ namespace PepperDash.Essentials
 		/// </summary>
 		public const uint RoomUserCode = 3907;
         /// <summary>
-        /// 3908 - The url for the mobile control server
-        /// </summary>
-        public const uint RoomMcUrl = 3908;
-        /// <summary>
-        /// 3909 - The url for the mobile control QR Code image
-        /// </summary>
-        public const uint RoomMcQrCodeUrl = 3909;
-        /// <summary>
         /// 3911
         /// </summary>
 		public const uint PowerOffMessage = 3911;
@@ -201,19 +189,12 @@ namespace PepperDash.Essentials
         /// <summary>
         /// 3923
         /// </summary>
-        public const uint LogoUrlLightBkgnd = 3923;
-
-
+        public const uint LogoUrl = 3923;
         /// <summary>
         /// 3924 - the text on the "call help desk" button
         /// </summary>
         public const uint HelpPageCallButtonText = 3924;
 
-        /// <summary>
-        /// 3925
-        /// </summary>
-        public const uint LogoUrlDarkBkgnd = 3925;
-
 		/// <summary>
 		/// 3951
 		/// </summary>

PepperDashEssentials/UIDrivers/Essentials/EssentialsPanelMainInterfaceDriver.cs

@@ -1,5 +1,4 @@
 using System;
-using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.UI;
 using PepperDash.Essentials.Core;
@@ -12,8 +11,6 @@ namespace PepperDash.Essentials
 	/// </summary>
 	public class EssentialsPanelMainInterfaceDriver : PanelDriverBase
 	{
-        CTimer InactivityTimer;
-
 		/// <summary>
 		/// Assign the appropriate A/V driver.
 		/// Want to keep the AvDriver alive, because it may hold states
@@ -26,8 +23,6 @@ namespace PepperDash.Essentials
 
 		public PanelDriverBase CurrentChildDriver { get; private set; }
 
-        public ScreenSaverController ScreenSaverController { get; set; } 
-
 		CrestronTouchpanelPropertiesConfig Config;
 
         /// <summary>
@@ -40,59 +35,18 @@ namespace PepperDash.Essentials
 			: base(trilist)
 		{
 			Config = config;
-
-            var tsx52or60 = trilist as Tswx52ButtonVoiceControl;
-
-            if (tsx52or60 != null)
-            {
-                tsx52or60.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
-            }
-            else
-            {
-                var tswx70 = trilist as TswX70Base;
-                if (tswx70 != null)
-                {
-                    tswx70.ExtenderTouchDetectionReservedSigs.DeviceExtenderSigChange += ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange;
-                }
-            }
 		}
 
-        void ExtenderTouchDetectionReservedSigs_DeviceExtenderSigChange(Crestron.SimplSharpPro.DeviceExtender currentDeviceExtender, Crestron.SimplSharpPro.SigEventArgs args)
-        {
-            var timeoutMs = Config.ScreenSaverTimeoutMin * 60 * 1000;
-
-            if (args.Sig.BoolValue)
-            {
-                if (InactivityTimer != null)
-                {
-                    InactivityTimer.Reset(timeoutMs);
-                }
-                else
-                {
-                    InactivityTimer = new CTimer((o) => InactivityTimerExpired(), timeoutMs);
-                }
-            }
-        }
-
-        void InactivityTimerExpired()
-        {
-            InactivityTimer.Stop();
-            InactivityTimer.Dispose();
-            InactivityTimer = null;
-
-            ScreenSaverController.Show();
-        }
-
 		public override void Show()
 		{
 			CurrentChildDriver = null;
 			ShowSubDriver(AvDriver as PanelDriverBase);
-            base.Show();
+			base.Show();
 		}
 
 		public override void Hide()
 		{
-			TriList.BooleanInput[AvDriver.StartPageVisibleJoin].BoolValue = false;
+			TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
 			base.Hide();
 		}
 

PepperDashEssentials/UIDrivers/Essentials/EssentialsPresentationPanelAvFunctionsDriver.cs

@@ -267,7 +267,7 @@
 //            HideAndClearCurrentDisplayModeSigsInUse();
 //            tl[UIBoolJoin.TopBarHabaneroVisible].BoolValue = false;
 //            tl[UIBoolJoin.ActivityFooterVisible].BoolValue = false;
-//            tl[StartPageVisibleJoin].BoolValue = false;
+//            tl[UIBoolJoin.StartPageVisible].BoolValue = false;
 //            tl[UIBoolJoin.TapToBeginVisible].BoolValue = false;
 //            tl[UIBoolJoin.ToggleSharingModeVisible].BoolValue = false;
 //            tl[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
@@ -335,7 +335,7 @@
 //                    }
 //                    else
 //                    {
-//                        TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
+//                        TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true;
 //                        TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = true;
 //                        TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
 //                    }
@@ -525,7 +525,7 @@
 //            if (!_CurrentRoom.OnFeedback.BoolValue)
 //            {
 //                ShareButtonSig.BoolValue = true;
-//                TriList.BooleanInput[StartPageVisibleJoin].BoolValue = false;
+//                TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
 //                ShowCurrentSharingMode();
 //            }
 //        }
@@ -953,13 +953,13 @@
 //            if (value)
 //            {
 //                SetupActivityFooterWhenRoomOn();
-//                TriList.BooleanInput[StartPageVisibleJoin].BoolValue = false;
+//                TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
 //            }
 //            else
 //            {
 //                HideCurrentSharingMode();
 //                SetupActivityFooterWhenRoomOff();
-//                TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
+//                TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true;
 //                if (LastSelectedSourceSig != null)
 //                {
 //                    LastSelectedSourceSig.BoolValue = false;

PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs

@@ -24,9 +24,6 @@ namespace PepperDash.Essentials
 			PresentationMode, AudioSetup
 		}
 
-        public uint StartPageVisibleJoin { get; private set; }
-
-
 		/// <summary>
 		/// Whether volume ramping from this panel will show the volume
 		/// gauge popup.
@@ -212,7 +209,6 @@ namespace PepperDash.Essentials
                 "Tap Share to begin";
 		}
 
-
 		/// <summary>
 		/// 
 		/// </summary>
@@ -229,34 +225,20 @@ namespace PepperDash.Essentials
             if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Habanero)
             {
                 TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
-                    {
-                        if (CurrentRoom.IsMobileControlEnabled)
-                        {
-                            Debug.Console(1, "Showing Mobile Control Header Info");
-                            PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
-                        }
-                        else
-                        {
-                            Debug.Console(1, "Showing Non Mobile Control Header Info");
-                            PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
-                        }
-                    });
+                    PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderPageVisible));
             }
             else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose)
             {
-                TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
-                {
-                    if (CurrentRoom.IsMobileControlEnabled)
-                    {
-                        Debug.Console(1, "Showing Mobile Control Header Info");
-                        PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
-                    }
-                    else
-                    {
-                        Debug.Console(1, "Showing Non Mobile Control Header Info");
-                        PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
-                    }
-                });
+                // room name on join 1, concat phone and sip on join 2, no button method
+                //var addr = roomConf.Addresses;
+                //if (addr == null) // protect from missing values by using default empties
+                //    addr = new EssentialsRoomAddressPropertiesConfig();
+                //// empty string when either missing, pipe when both showing
+                //TriList.SetString(UIStringJoin.RoomAddressPipeText, 
+                //    (string.IsNullOrEmpty(addr.PhoneNumber.Trim())
+                //    || string.IsNullOrEmpty(addr.SipAddress.Trim())) ? "" : " | ");
+                //TriList.SetString(UIStringJoin.RoomPhoneText, addr.PhoneNumber);
+                //TriList.SetString(UIStringJoin.RoomSipText, addr.SipAddress);
             }
 
             TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime);
@@ -274,7 +256,7 @@ namespace PepperDash.Essentials
             }
             else
             {
-                TriList.SetBool(StartPageVisibleJoin, true);
+                TriList.SetBool(UIBoolJoin.StartPageVisible, true);
                 TriList.SetBool(UIBoolJoin.TapToBeginVisible, true);
                 SetupActivityFooterWhenRoomOff();
             }
@@ -339,7 +321,7 @@ namespace PepperDash.Essentials
         /// </summary>
         void ShowLogo()
         {
-            if (CurrentRoom.LogoUrlLightBkgnd == null)
+            if (CurrentRoom.LogoUrl == null)
             {
                 TriList.SetBool(UIBoolJoin.LogoDefaultVisible, true);
                 TriList.SetBool(UIBoolJoin.LogoUrlVisible, false);
@@ -348,8 +330,7 @@ namespace PepperDash.Essentials
             {
                 TriList.SetBool(UIBoolJoin.LogoDefaultVisible, false);
                 TriList.SetBool(UIBoolJoin.LogoUrlVisible, true);
-                TriList.SetString(UIStringJoin.LogoUrlLightBkgnd, _CurrentRoom.LogoUrlLightBkgnd);
-                TriList.SetString(UIStringJoin.LogoUrlDarkBkgnd, _CurrentRoom.LogoUrlDarkBkgnd);
+                TriList.SetString(UIStringJoin.LogoUrl, _CurrentRoom.LogoUrl);
             }
         }
 
@@ -370,7 +351,7 @@ namespace PepperDash.Essentials
 			HideAndClearCurrentDisplayModeSigsInUse();
             TriList.BooleanInput[UIBoolJoin.TopBarHabaneroDynamicVisible].BoolValue = false;
             TriList.BooleanInput[UIBoolJoin.ActivityFooterVisible].BoolValue = false;
-            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = false;
+            TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
             TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false;
             TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
             //TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false;
@@ -435,7 +416,7 @@ namespace PepperDash.Essentials
                     }
                     else
                     {
-                        TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
+                        TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true;
                         TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = true;
                         TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
                     }
@@ -493,7 +474,7 @@ namespace PepperDash.Essentials
         void ShareButtonPressed()
         {
             ShareButtonSig.BoolValue = true;
-            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = false;
+            TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
             TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = true;
             TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true;
             // Run default source when room is off and share is pressed
@@ -797,7 +778,7 @@ namespace PepperDash.Essentials
                 }
                 // Name and logo
                 TriList.StringInput[UIStringJoin.CurrentRoomName].StringValue = _CurrentRoom.Name;
-                if (_CurrentRoom.LogoUrlLightBkgnd == null)
+                if (_CurrentRoom.LogoUrl == null)
                 {
                     TriList.BooleanInput[UIBoolJoin.LogoDefaultVisible].BoolValue = true;
                     TriList.BooleanInput[UIBoolJoin.LogoUrlVisible].BoolValue = false;
@@ -806,9 +787,7 @@ namespace PepperDash.Essentials
                 {
                     TriList.BooleanInput[UIBoolJoin.LogoDefaultVisible].BoolValue = false;
                     TriList.BooleanInput[UIBoolJoin.LogoUrlVisible].BoolValue = true;
-                    TriList.StringInput[UIStringJoin.LogoUrlLightBkgnd].StringValue = _CurrentRoom.LogoUrlLightBkgnd;
-                    TriList.StringInput[UIStringJoin.LogoUrlLightBkgnd].StringValue = _CurrentRoom.LogoUrlDarkBkgnd;
-
+                    TriList.StringInput[UIStringJoin.LogoUrl].StringValue = _CurrentRoom.LogoUrl;
                 }
 
                 // Shutdown timer
@@ -841,43 +820,12 @@ namespace PepperDash.Essentials
 			if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
 
-            if (_CurrentRoom != null)
-                _CurrentRoom.ConfigChanged -= room_ConfigChanged;
-
             room.ConfigChanged -= room_ConfigChanged;
             room.ConfigChanged += room_ConfigChanged;
 
-            if (room.IsMobileControlEnabled)
-            {
-                StartPageVisibleJoin = UIBoolJoin.StartMCPageVisible;
-                UpdateMCJoins(room);
-
-                if (_CurrentRoom != null)
-                    _CurrentRoom.MobileControlRoomBridge.UserCodeChanged -= MobileControlRoomBridge_UserCodeChanged;
-
-                room.MobileControlRoomBridge.UserCodeChanged -= MobileControlRoomBridge_UserCodeChanged;
-                room.MobileControlRoomBridge.UserCodeChanged += MobileControlRoomBridge_UserCodeChanged;
-            }
-            else
-            {
-                StartPageVisibleJoin = UIBoolJoin.StartPageVisible;
-            }
-
             RefreshCurrentRoom(room);
 		}
 
-        void MobileControlRoomBridge_UserCodeChanged(object sender, EventArgs e)
-        {
-            UpdateMCJoins(_CurrentRoom);
-        }
-
-        void UpdateMCJoins(EssentialsHuddleSpaceRoom room)
-        {
-            TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
-            TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
-            TriList.SetString(UIStringJoin.RoomUserCode, room.MobileControlRoomBridge.UserCode);
-        }
-
         /// <summary>
         /// Fires when room config of current room has changed.  Meant to refresh room values to propegate any updates to UI
         /// </summary>
@@ -907,7 +855,7 @@ namespace PepperDash.Essentials
                 SetupActivityFooterWhenRoomOn();
                 TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = true;
-                TriList.BooleanInput[StartPageVisibleJoin].BoolValue = false;
+                TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = true;
 
             }
@@ -915,7 +863,7 @@ namespace PepperDash.Essentials
             {
                 SetupActivityFooterWhenRoomOff();
                 ShowLogo();
-                TriList.BooleanInput[StartPageVisibleJoin].BoolValue = true;
+                TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true;
                 TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false;
                 TriList.BooleanInput[UIBoolJoin.SourceStagingBarVisible].BoolValue = false;
             }

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -28,8 +28,6 @@ namespace PepperDash.Essentials
             Presentation, AudioSetup, Call, Start
         }
 
-        public uint StartPageVisibleJoin { get; private set; }
-
         /// <summary>
         /// Whether volume ramping from this panel will show the volume
         /// gauge popup.
@@ -242,34 +240,20 @@ namespace PepperDash.Essentials
             if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Habanero)
             {
                 TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
-                {
-                    if (CurrentRoom.IsMobileControlEnabled)
-                    {
-                        Debug.Console(1,  "Showing Mobile Control Header Info");
-                        PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
-                    }
-                    else
-                    {
-                        Debug.Console(1,  "Showing Non Mobile Control Header Info");
-                        PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
-                    }
-                });
+                    PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderPageVisible));
             }
 			else if (Config.HeaderStyle.ToLower() == CrestronTouchpanelPropertiesConfig.Verbose)
             {
-                TriList.SetSigFalseAction(UIBoolJoin.HeaderRoomButtonPress, () =>
-                {
-                    if (CurrentRoom.IsMobileControlEnabled)
-                    {
-                        Debug.Console(1, "Showing Mobile Control Header Info");
-                        PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoMCPageVisible);
-                    }
-                    else
-                    {
-                        Debug.Console(1, "Showing Non Mobile Control Header Info");
-                        PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.RoomHeaderInfoPageVisible);
-                    }
-                });
+                // room name on join 1, concat phone and sip on join 2, no button method
+				//var addr = roomConf.Addresses;
+				//if (addr == null) // protect from missing values by using default empties
+				//    addr = new EssentialsRoomAddressPropertiesConfig();
+				//// empty string when either missing, pipe when both showing
+				//TriList.SetString(UIStringJoin.RoomAddressPipeText, 
+				//    (string.IsNullOrEmpty(addr.PhoneNumber.Trim())
+				//    || string.IsNullOrEmpty(addr.SipAddress.Trim())) ? "" : " | ");
+				//TriList.SetString(UIStringJoin.RoomPhoneText, addr.PhoneNumber);
+				//TriList.SetString(UIStringJoin.RoomSipText, addr.SipAddress);
             }
 
             TriList.SetBool(UIBoolJoin.DateAndTimeVisible, Config.ShowDate && Config.ShowTime);
@@ -292,7 +276,7 @@ namespace PepperDash.Essentials
             }
             else
             {
-                TriList.SetBool(StartPageVisibleJoin, true);
+                TriList.SetBool(UIBoolJoin.StartPageVisible, true);
                 TriList.SetBool(UIBoolJoin.TapToBeginVisible, true);
 				SetupActivityFooterWhenRoomOff();
             }
@@ -348,7 +332,7 @@ namespace PepperDash.Essentials
         /// </summary>
         void ShowLogo()
         {
-            if (CurrentRoom.LogoUrlLightBkgnd == null)
+            if (CurrentRoom.LogoUrl == null)
             {
                 TriList.SetBool(UIBoolJoin.LogoDefaultVisible, true);
                 TriList.SetBool(UIBoolJoin.LogoUrlVisible, false);
@@ -357,8 +341,7 @@ namespace PepperDash.Essentials
             {
                 TriList.SetBool(UIBoolJoin.LogoDefaultVisible, false);
                 TriList.SetBool(UIBoolJoin.LogoUrlVisible, true);
-                TriList.SetString(UIStringJoin.LogoUrlLightBkgnd, _CurrentRoom.LogoUrlLightBkgnd);
-                TriList.SetString(UIStringJoin.LogoUrlDarkBkgnd, _CurrentRoom.LogoUrlDarkBkgnd);
+                TriList.SetString(UIStringJoin.LogoUrl, _CurrentRoom.LogoUrl);
             }
         }
 
@@ -379,7 +362,7 @@ namespace PepperDash.Essentials
             HideAndClearCurrentDisplayModeSigsInUse();
 			TriList.SetBool(UIBoolJoin.TopBarHabaneroDynamicVisible, false);
             TriList.BooleanInput[UIBoolJoin.ActivityFooterVisible].BoolValue = false;
-            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = false;
+            TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
             TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false;
             TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false;
 			if (NextMeetingTimer != null)
@@ -623,7 +606,7 @@ namespace PepperDash.Essentials
                 return;
             HideLogo();
 			HideNextMeetingPopup();
-            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.StartPageVisible, false);
             TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, false);
             TriList.SetBool(UIBoolJoin.SelectASourceVisible, false);
             if (CurrentSourcePageManager != null)
@@ -643,7 +626,7 @@ namespace PepperDash.Essentials
             if (VCDriver.IsVisible)
                 VCDriver.Hide();
 			HideNextMeetingPopup();
-            TriList.SetBool(StartPageVisibleJoin, false);
+            TriList.SetBool(UIBoolJoin.StartPageVisible, false);
             TriList.SetBool(UIBoolJoin.CallStagingBarVisible, false);
             TriList.SetBool(UIBoolJoin.SourceStagingBarVisible, true);
             // Run default source when room is off and share is pressed
@@ -974,43 +957,12 @@ namespace PepperDash.Essentials
             if (_CurrentRoom == room) return;
             // Disconnect current (probably never called)
 
-            if(_CurrentRoom != null)
-                _CurrentRoom.ConfigChanged -= room_ConfigChanged;
-
             room.ConfigChanged -= room_ConfigChanged;
             room.ConfigChanged += room_ConfigChanged;
 
-            if (room.IsMobileControlEnabled)
-            {
-                StartPageVisibleJoin = UIBoolJoin.StartMCPageVisible;
-                UpdateMCJoins(room);
-
-                if (_CurrentRoom != null)
-                    _CurrentRoom.MobileControlRoomBridge.UserCodeChanged -= MobileControlRoomBridge_UserCodeChanged;
-
-                room.MobileControlRoomBridge.UserCodeChanged -= MobileControlRoomBridge_UserCodeChanged;
-                room.MobileControlRoomBridge.UserCodeChanged += MobileControlRoomBridge_UserCodeChanged;
-            }
-            else
-            {
-                StartPageVisibleJoin = UIBoolJoin.StartPageVisible;
-            }
-
             RefreshCurrentRoom(room);
         }
 
-        void MobileControlRoomBridge_UserCodeChanged(object sender, EventArgs e)
-        {
-            UpdateMCJoins(_CurrentRoom);
-        }
-
-        void UpdateMCJoins(EssentialsHuddleVtc1Room room)
-        {
-            TriList.SetString(UIStringJoin.RoomMcUrl, room.MobileControlRoomBridge.McServerUrl);
-            TriList.SetString(UIStringJoin.RoomMcQrCodeUrl, room.MobileControlRoomBridge.QrCodeUrl);
-            TriList.SetString(UIStringJoin.RoomUserCode, room.MobileControlRoomBridge.UserCode);
-        }
-
         /// <summary>
         /// Fires when room config of current room has changed.  Meant to refresh room values to propegate any updates to UI
         /// </summary>
@@ -1197,7 +1149,7 @@ namespace PepperDash.Essentials
             var value = _CurrentRoom.OnFeedback.BoolValue;
             TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value;
 
-            TriList.BooleanInput[StartPageVisibleJoin].BoolValue = !value;
+            TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = !value;
 
             if (value) //ON
             {
@@ -1429,7 +1381,6 @@ namespace PepperDash.Essentials
         void ShowNotificationRibbon(string message, int timeout);
         void HideNotificationRibbon();
         void ShowTech();
-        uint StartPageVisibleJoin { get; }
     }
 
     /// <summary>

PepperDashEssentials/UIDrivers/ScreenSaverController.cs

@@ -1,118 +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
-{
-    /// <summary>
-    /// Driver responsible for controlling the screenshaver showing the client logo, MC connection information and QR Code.  Moves the elements around to prevent screen burn in
-    /// </summary>
-    public class ScreenSaverController : PanelDriverBase
-    {
-        CTimer PositionTimer;
-
-        uint PositionTimeoutMs;
-
-        List<uint> PositionJoins;
-
-        int CurrentPositionIndex = 0;
-
-        public ScreenSaverController(EssentialsPanelMainInterfaceDriver parent, CrestronTouchpanelPropertiesConfig config)
-            : base(parent.TriList)
-        {
-            PositionTimeoutMs = config.ScreenSaverMovePositionIntervalMs;
-
-            TriList.SetSigFalseAction(UIBoolJoin.MCScreenSaverClosePress, () => this.Hide());
-
-            PositionJoins = new List<uint>() 
-                { UIBoolJoin.MCScreenSaverPosition1Visible, UIBoolJoin.MCScreenSaverPosition2Visible, UIBoolJoin.MCScreenSaverPosition3Visible, UIBoolJoin.MCScreenSaverPosition4Visible };
-
-            CrestronConsole.AddNewConsoleCommand((o) => Show(), "showscreensaver", "Shows Panel Screensaver", ConsoleAccessLevelEnum.AccessOperator);
-        }
-
-        public override void Show()
-        {
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, true);
-
-            CurrentPositionIndex = 0;
-            SetCurrentPosition();
-            StartPositionTimer();
-
-            base.Show();
-        }
-
-        public override void Hide()
-        {
-            PositionTimer.Stop();
-            PositionTimer.Dispose();
-            PositionTimer = null;
-
-            ClearAllPositions();
-
-            TriList.SetBool(UIBoolJoin.MCScreenSaverVisible, false);
-
-            base.Hide();
-        }
-
-
-
-        void StartPositionTimer()
-        {
-            if (PositionTimer == null)
-            {
-                PositionTimer = new CTimer((o) => PositionTimerExpired(), PositionTimeoutMs);
-            }
-            else
-            {
-                PositionTimer.Reset(PositionTimeoutMs);
-            }
-
-        }
-
-        void PositionTimerExpired()
-        {
-            IncrementPositionIndex();
-
-            SetCurrentPosition();
-
-            StartPositionTimer();
-        }
-
-        void IncrementPositionIndex()
-        {
-            if (CurrentPositionIndex < PositionJoins.Count - 1)
-            {
-                CurrentPositionIndex++;
-            }
-            else
-            {
-                CurrentPositionIndex = 0;
-            }
-
-            Debug.Console(1, "ScreenSaver Position Timer Expired: Setting new position: {0}", CurrentPositionIndex);
-        }
-
-        //
-        void SetCurrentPosition()
-        {
-            ClearAllPositions();
-
-            // Set based on current index
-            TriList.SetBool(PositionJoins[CurrentPositionIndex], true);
-        }
-
-        void ClearAllPositions()
-        {
-            foreach (var join in PositionJoins)
-            {
-                TriList.SetBool(join, false);
-            }
-        }
-    }
- 
-}

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -192,76 +192,22 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// <param name="e"></param>
         void Codec_IsReady()
         {
-            SetupAddresses();
+            string roomNumberSipUri = "";
+
+            if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider
+                roomNumberSipUri = string.Format("{0} | {1}", GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber), Codec.CodecInfo.SipUri);
+            else                                               // If only one value present, just show the phone number
+                roomNumberSipUri = Codec.CodecInfo.SipPhoneNumber;
+
+            if(string.IsNullOrEmpty(roomNumberSipUri))
+                roomNumberSipUri = string.Format("{0} | {1}", Codec.CodecInfo.E164Alias, Codec.CodecInfo.H323Id);
+
+            TriList.SetString(UIStringJoin.RoomPhoneText, roomNumberSipUri);
 
             if(HeaderDriver.HeaderButtonsAreSetUp)
                 HeaderDriver.ComputeHeaderCallStatus(Codec);
         }
 
-        void SetupAddresses()
-        {
-            string roomContactNumbers = "";
-            string roomPhoneNumber = "";
-            string roomVideoAddress = "";
-
-
-            Debug.Console(1,
-                @"
-                    Codec.CodecInfo.IpAddress: {0}
-                    Codec.CodecInfo.SipUri: {1}
-                    Codec.CodecInfo.SipPhoneNumber: {2}
-                    Codec.CodecInfo.E164Alias: {3}
-                    Codec.CodecInfo.H323Id: {4}
-                 ", Codec.CodecInfo.IpAddress, Codec.CodecInfo.SipUri, Codec.CodecInfo.SipPhoneNumber, Codec.CodecInfo.E164Alias, Codec.CodecInfo.H323Id);
-
-            // Populate phone number
-            if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider
-            {
-                roomPhoneNumber = Codec.CodecInfo.SipUri;
-            }
-            else if (!string.IsNullOrEmpty(Codec.CodecInfo.SipPhoneNumber))   // If only one value present, just show the phone number
-            {
-                roomPhoneNumber = GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber);
-            }
-
-            // Populate video number
-            if (!string.IsNullOrEmpty(Codec.CodecInfo.IpAddress))
-            {
-                roomVideoAddress = Codec.CodecInfo.IpAddress;
-            }
-            else if (!string.IsNullOrEmpty(Codec.CodecInfo.E164Alias))
-            {
-                roomVideoAddress = Codec.CodecInfo.E164Alias;
-            }
-            else if (!string.IsNullOrEmpty(Codec.CodecInfo.H323Id))
-            {
-                roomVideoAddress = Codec.CodecInfo.H323Id;
-            }
-
-            Debug.Console(1,
-            @" Room Contact Numbers:
-               Phone Number: {0}
-               Video Number: {1}
-            ", roomPhoneNumber, roomVideoAddress);
-
-            if (!string.IsNullOrEmpty(roomPhoneNumber) && !string.IsNullOrEmpty(roomVideoAddress))
-            {
-                roomContactNumbers = string.Format("{0} | {1}", roomPhoneNumber, roomVideoAddress);
-            }
-            else if (!string.IsNullOrEmpty(roomPhoneNumber))
-            {
-                roomContactNumbers = roomPhoneNumber;
-            }
-            else if (!string.IsNullOrEmpty(roomVideoAddress))
-            {
-                roomContactNumbers = roomVideoAddress;
-            }
-
-            TriList.SetString(UIStringJoin.RoomAddressPipeText, roomContactNumbers);
-            TriList.SetString(UIStringJoin.RoomPhoneText, roomPhoneNumber);
-            TriList.SetString(UIStringJoin.RoomVideoAddressText, roomVideoAddress);
-        }
-
         /// <summary>
         /// Handles status changes for calls
         /// </summary>

README.md

@@ -1,26 +1,37 @@
-
 # PepperDash Essentials Framework (c) 2020
 
 ## [Latest Release](https://github.com/PepperDash/Essentials/releases/latest)
 
 ## License
+
 Provided under MIT license
 
 ## Overview
+
 PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs.
 
 Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.
 
 ## Minimum Requirements
+
 - Essentials Framework runs on any Crestron 3-series processor, **4-series** processor or Crestron's VC-4 platform.
 - To edit and compile the source, Microsoft Visual Studio 2008 Professional with SP1 is required.
 - Crestron's Simpl# Plugin is also required (must be obtained from Crestron).
 
 ## Dependencies
 
-The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required.  It is referenced as a submodule and will be automatically checked out when cloning this repo if set to recurse submodules.  This allows different builds of the PepperDash.Core library to be referenced by checking out the desired submodule commit.
+The [PepperDash.Core](https://github.com/PepperDash/PepperDashCore) SIMPL# library is required. It is referenced via nuget. You must have nuget.exe installed and in the `PATH` environment variable to use the following command. Nuget.exe is available at [nuget.org](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe).
+
+### Installing Dependencies
+
+To install dependencies once nuget.exe is installed, run the following command: `nuget install .\packages.config -OutputDirectory .\packages -excludeVersion`. To verify that the packages installed correctly, open Essentials and make sure that all references are found, then try and build it.
+
+### Installing Different versions of PepperDash Core
+
+If you need a different version of PepperDash Core, use the command `nuget install .\packages.config -OutputDirectory .\packages -excludeVersion -Version {versionToGet}`. Omitting the `-Version` option will pull the latest release version of PepperDash Core.
 
 ## Utilization
+
 Essentials was originally conceptualized as a standalone application for running control system logic entirely in Simpl# Pro. It is primarily designed around accomplishing this goal, but during development, it became obvious that it could easily be leveraged to also serve as a partner application to one or more SIMPL Windows programs.
 
 Utilization of Essentials Framework falls into the following categories:
@@ -34,13 +45,13 @@ Utilization of Essentials Framework falls into the following categories:
 - Advanced logic. Some logic operations that cannot be affectively accomplished in SIMPL Windows (ex. JSON/XML serialization/deserialization, database operations, etc.) can be done in the Simpl# Pro environment and the necessary input and output bridged to a SIMPL Windows program via EISC.
 
 3. Hybrid Application that may contain elements of both standalone control and SIMPL partner application integration.
-- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications.  The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
 
- ## Documentation
- For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
+- There may be a use case where a device can only be defined in a single application, but that device may need to be interacted with from multiple applications. The device can be defined in an Essentials application, interacted with in that application and also bridged to one or more SIMPL Windows applications.
+
+## Documentation
+
+For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
 ## How-To (Getting Started)
 
 See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
-
-

essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IMobileControl.cs

@@ -1,33 +1,11 @@
-using System;
-using PepperDash.Core;
+using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
-    /// <summary>
-    /// Describes a MobileControlSystemController
-    /// </summary>
-    public interface IMobileControl : IKeyed
+    public interface IMobileControl:IKeyed
     {
         void CreateMobileControlRoomBridge(EssentialsRoomBase room);
 
         void LinkSystemMonitorToAppServer();
-
-
-    }
-
-    /// <summary>
-    /// Describes a MobileControl Room Bridge
-    /// </summary>
-    public interface IMobileControlRoomBridge : IKeyed
-    {
-        event EventHandler<EventArgs> UserCodeChanged;
-
-        string UserCode { get; }
-
-        string QrCodeUrl { get; }
-
-        string McServerUrl { get; }
-
-        string RoomName { get; }
     }
 }

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

@@ -337,7 +337,36 @@ namespace PepperDash.Essentials.Core
                 return;
             }
             com.SimulateReceive(match.Groups[2].Value);
-        }
+        }
+
+        /// <summary>
+        /// Prints a list of routing inputs and outputs by device key.
+        /// </summary>
+        /// <param name="s">Device key from which to report data</param>
+	    public static void GetRoutingPorts(string s)
+	    {
+	        var device = GetDeviceForKey(s);
+
+	        if (device == null) return;
+	        var inputPorts = (device as IRoutingInputsOutputs).InputPorts;
+	        var outputPorts = (device as IRoutingInputsOutputs).OutputPorts;
+	        if (inputPorts != null)
+	        {
+	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
+	            foreach (var routingInputPort in inputPorts)
+	            {
+	                Debug.Console(0, "{0}", routingInputPort.Key);
+	            }
+	        }
+	        if (outputPorts != null)
+	        {
+	            Debug.Console(0, "Device {0} has {1} Output Ports:", s, outputPorts.Count);
+	            foreach (var routingOutputPort in outputPorts)
+	            {
+	                Debug.Console(0, "{0}", routingOutputPort.Key);
+	            }
+	        }
+	    }
 
         /// <summary>
         /// Attempts to set the debug level of a device

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

@@ -165,34 +165,29 @@ namespace PepperDash.Essentials.Core.Fusion
                 {
                     // Exists. Read GUIDs
                     ReadGuidFile(guidFilePath);
-                }
-
-                if (Room.RoomOccupancy != null)
-                {
-                    if (Room.OccupancyStatusProviderIsRemote)
-                        SetUpRemoteOccupancy();
-                    else
-                    {
-                        SetUpLocalOccupancy();
-                    }
                 }
 
-                
+                CreateSymbolAndBasicSigs(IpId);
+                SetUpSources();
+                SetUpCommunitcationMonitors();
+                SetUpDisplay();
+                SetUpError();
+                ExecuteCustomSteps();
 
-                AddPostActivationAction(() =>
-                {
-                    CreateSymbolAndBasicSigs(IpId);
-                    SetUpSources();
-                    SetUpCommunitcationMonitors();
-                    SetUpDisplay();
-                    SetUpError();
-                    ExecuteCustomSteps();
-
-                    FusionRVI.GenerateFileForAllFusionDevices();
-
-                    GenerateGuidFile(guidFilePath);
-                });
+                if (Room.RoomOccupancy != null)
+                {
+                    if (Room.OccupancyStatusProviderIsRemote)
+                        SetUpRemoteOccupancy();
+                    else
+                    {
+                        SetUpLocalOccupancy();
+                    }
+                }
 
+                // Make it so!   
+                FusionRVI.GenerateFileForAllFusionDevices();
+
+                GenerateGuidFile(guidFilePath);
             }
             catch (Exception e)
             {

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

@@ -103,20 +103,27 @@ namespace PepperDash.Essentials.Core.Monitoring
         }
 
         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);
+        {
+            try
+            {
+                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);
+            }
+            catch (Exception e)
+            {
+                ErrorLog.Exception(String.Format("Exception unable to parse string '{1}'", response), e);
+            }
         }
 
         private void CrestronEnvironmentOnEthernetEventHandler(EthernetEventArgs ethernetEventArgs)

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

@@ -83,9 +83,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>PepperDashEssentials</id>
+    <version>1.5.6</version>
+    <title>PepperDash Essentials</title>
+    <authors>PepperDash Technologies</authors>
+    <owners>pepperdash</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/PepperDash/PepperDashCore</projectUrl>
+    <copyright>Copyright 2020</copyright>
+    <description>PepperDash Essentials is an open source Crestron framework that can be configured as a standalone program capable of running a wide variety of system designs and can also be utilized as a plug-in architecture to augment other Simpl# Pro and Simpl Windows programs. Essentials Framework is a collection of C# / Simpl# Pro libraries that can be utilized in several different manners. It is currently operating as a 100% configuration-driven system, and can be extended to add different workflows and behaviors, either through the addition of further device "types" or via the plug-in mechanism. The framework is a collection of "things" that are all related and interconnected, but in general do not have dependencies on each other.</description>
+    <tags>crestron 3series 4series</tags>
+    <repository type="git" url="https://github.com/PepperDash/Essentials"/>
+    <dependencies>
+      <dependency id="PepperDashCore" version="[1.0, 1.1)"/>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="**" target="lib\net35"/>
+    <file src="**" target="lib\net47"/>
+  </files>
+</package>

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

@@ -9,7 +9,6 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Core
 {
@@ -38,16 +37,6 @@ namespace PepperDash.Essentials.Core
         protected abstract Func<bool> IsWarmingFeedbackFunc { get; }
         protected abstract Func<bool> IsCoolingFeedbackFunc { get; }
 
-        /// <summary>
-        /// Indicates if this room is Mobile Control Enabled
-        /// </summary>
-        public bool IsMobileControlEnabled { get; private set; }
-
-        /// <summary>
-        /// The bridge for this room if Mobile Control is enabled
-        /// </summary>
-        public IMobileControlRoomBridge MobileControlRoomBridge { get; private set; }
-
         /// <summary>
         /// The config name of the source list
         /// </summary>
@@ -69,9 +58,7 @@ namespace PepperDash.Essentials.Core
 
         public Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; set; }
 
-        public string LogoUrlLightBkgnd { get; set; }
-
-        public string LogoUrlDarkBkgnd { get; set; }
+        public string LogoUrl { get; set; }
 
         protected SecondsCountdownTimer RoomVacancyShutdownTimer { get; private set; }
 
@@ -141,34 +128,6 @@ namespace PepperDash.Essentials.Core
             });
         }
 
-        public override bool CustomActivate()
-        {
-            SetUpMobileControl();
-
-            return base.CustomActivate();
-        }
-
-        /// <summary>
-        /// If mobile control is enabled, sets the appropriate properties
-        /// </summary>
-        void SetUpMobileControl()
-        {
-            var mcBridgeKey = string.Format("mobileControlBridge-{0}", Key);
-            var mcBridge = DeviceManager.GetDeviceForKey(mcBridgeKey);
-            if (mcBridge == null)
-            {
-                Debug.Console(1, this, "*********************Mobile Control Bridge Not found for this room.");
-                IsMobileControlEnabled = false;
-                return;
-            }
-            else
-            {
-                MobileControlRoomBridge = mcBridge as IMobileControlRoomBridge;
-                Debug.Console(1, this, "*********************Mobile Control Bridge found and enabled for this room");
-                IsMobileControlEnabled = true;
-            }
-        }
-
         void RoomVacancyShutdownPromptTimer_HasFinished(object sender, EventArgs e)
         {
             switch (VacancyMode)

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

@@ -14,8 +14,6 @@
         public UiSetupPropertiesConfig Setup { get; set; }
         public string HeaderStyle { get; set; }
         public bool IncludeInFusionRoomHealth { get; set; }
-        public uint ScreenSaverTimeoutMin { get; set; }
-        public uint ScreenSaverMovePositionIntervalMs { get; set; }
 
 
         /// <summary>
@@ -28,10 +26,6 @@
         {
             SourcesOverflowCount = 5;
             HeaderStyle = CrestronTouchpanelPropertiesConfig.Habanero;
-
-            // Default values
-            ScreenSaverTimeoutMin = 5;
-            ScreenSaverMovePositionIntervalMs = 15000;
         }
 
         /// <summary>

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -329,64 +329,56 @@ namespace PepperDash.Essentials.DM
                     InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => { return Chassis.Inputs[tempX].EndpointOnlineFeedback; });
 
                     InputCardHdcpStateFeedbacks[tempX] = new IntFeedback(() => {
-                        try
+                        var inputCard = Chassis.Inputs[tempX];
+
+                        if (inputCard.Card is DmcHd)
                         {
-                            var inputCard = Chassis.Inputs[tempX];
+                            InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
 
-                            if (inputCard.Card is DmcHd)
-                            {
-                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
-
-                                if ((inputCard.Card as DmcHd).HdmiInput.HdcpSupportOnFeedback.BoolValue)
-                                    return 1;
-                                return 0;
-                            }
-
-                            if (inputCard.Card is DmcHdDsp)
-                            {
-                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
-
-                                if ((inputCard.Card as DmcHdDsp).HdmiInput.HdcpSupportOnFeedback.BoolValue)
-                                    return 1;
-                                return 0;
-                            }
-                            if (inputCard.Card is Dmc4kHdBase)
-                            {
-                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
-                                return (int)(inputCard.Card as Dmc4kHdBase).HdmiInput.HdcpReceiveCapability;
-                            }
-                            if (inputCard.Card is Dmc4kCBase)
-                            {
-                                if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
-                                {
-                                    InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
-                                    return (int)(inputCard.Card as Dmc4kCBase).DmInput.HdcpReceiveCapability;
-                                }
-
-                                if ((inputCard.Card as Dmc4kCBase).DmInput.HdcpSupportOnFeedback.BoolValue)
-                                    return 1;
-                                return 0;
-                            }
-                            if (inputCard.Card is Dmc4kCDspBase)
-                            {
-                                if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
-                                {
-                                    InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
-                                    return (int)(inputCard.Card as Dmc4kCDspBase).DmInput.HdcpReceiveCapability;
-                                }
-
-                                if ((inputCard.Card as Dmc4kCDspBase).DmInput.HdcpSupportOnFeedback.BoolValue)
-                                    return 1;
-
-                                return 0;
-                            }
+                            if ((inputCard.Card as DmcHd).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                                return 1;
                             return 0;
                         }
-                        catch (InvalidOperationException iopex)
+
+                        if (inputCard.Card is DmcHdDsp)
                         {
-                            Debug.Console(0, this, Debug.ErrorLogLevel.Warning, "The Input Card in slot: {0} supports HDCP 2.  Please update the configuration value in the inputCardSupportsHdcp2 object to true. Error: {1}", tempX, iopex);
+                            InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+
+                            if ((inputCard.Card as DmcHdDsp).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                                return 1;
                             return 0;
-                        }   
+                        }
+                        if (inputCard.Card is Dmc4kHdBase)
+                        {
+                            InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
+                            return (int)(inputCard.Card as Dmc4kHdBase).HdmiInput.HdcpReceiveCapability;
+                        }
+                        if (inputCard.Card is Dmc4kCBase)
+                        {
+                            if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
+                            {
+                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+                                return (int)(inputCard.Card as Dmc4kCBase).DmInput.HdcpReceiveCapability;
+                            }
+
+                            if ((inputCard.Card as Dmc4kCBase).DmInput.HdcpSupportOnFeedback.BoolValue)
+                                return 1;
+                            return 0;
+                        }
+                        if (inputCard.Card is Dmc4kCDspBase)
+                        {
+                            if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
+                            {
+                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+                                return (int)(inputCard.Card as Dmc4kCDspBase).DmInput.HdcpReceiveCapability;
+                            }
+
+                            if ((inputCard.Card as Dmc4kCDspBase).DmInput.HdcpSupportOnFeedback.BoolValue)
+                                return 1;
+                            
+                            return 0;
+                        }
+                        return 0;
                     });
                 }
             }
@@ -622,13 +614,6 @@ namespace PepperDash.Essentials.DM
                 var cecPort2 = outputCard.Card2.HdmiOutput;
                 AddDmcHdoPorts(number, cecPort1, cecPort2);
             }
-            else if (type == "dmc4kzhdo")
-            {
-                var outputCard = new Dmc4kzHdoSingle(number, Chassis);
-                var cecPort1 = outputCard.Card1.HdmiOutput;
-                var cecPort2 = outputCard.Card2.HdmiOutput;
-                AddDmcHdoPorts(number, cecPort1, cecPort2);
-            }
             else if (type == "dmchdo")
             {
                 var outputCard = new DmcHdoSingle(number, Chassis);
@@ -815,62 +800,55 @@ namespace PepperDash.Essentials.DM
 
         void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
         {
-            try
+            switch (args.EventId)
             {
-                switch (args.EventId)
+                case DMInputEventIds.EndpointOnlineEventId:
                 {
-                    case DMInputEventIds.EndpointOnlineEventId:
-                        {
-                            Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                            break;
-                        }
-                    case DMInputEventIds.OnlineFeedbackEventId:
-                        {
-                            Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                            break;
-                        }
-                    case DMInputEventIds.VideoDetectedEventId:
-                        {
-                            Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
-                            VideoInputSyncFeedbacks[args.Number].FireUpdate();
-                            break;
-                        }
-                    case DMInputEventIds.InputNameEventId:
-                        {
-                            Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                            InputNameFeedbacks[args.Number].FireUpdate();
-                            break;
-                        }
-                    case DMInputEventIds.UsbRoutedToEventId:
-                        {
-                            Debug.Console(2, this, "DM Input {0} UsbRoutedToEventId", args.Number);
-                            if (UsbInputRoutedToFeebacks[args.Number] != null)
-                                UsbInputRoutedToFeebacks[args.Number].FireUpdate();
-                            else
-                                Debug.Console(1, this, "No index of {0} found in UsbInputRoutedToFeedbacks");
-                            break;
-                        }
-                    case DMInputEventIds.HdcpCapabilityFeedbackEventId:
-                        {
-                            Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
-                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
-                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
-                            else
-                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
-                            break;
-                        }
-                    default:
-                        {
-                            Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
-                            break;
-                        }
+                    Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+                    InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+                    break;
+                }
+                case DMInputEventIds.OnlineFeedbackEventId:
+                {
+                    Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+                    InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+                    break;
+                }
+                case DMInputEventIds.VideoDetectedEventId:
+                {
+                    Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
+                    VideoInputSyncFeedbacks[args.Number].FireUpdate();
+                    break;
+                }
+                case DMInputEventIds.InputNameEventId:
+                {
+                    Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
+                    InputNameFeedbacks[args.Number].FireUpdate();
+                    break;
+                }
+                case DMInputEventIds.UsbRoutedToEventId:
+                {
+                    Debug.Console(2, this, "DM Input {0} UsbRoutedToEventId", args.Number);
+                    if (UsbInputRoutedToFeebacks[args.Number] != null)
+                        UsbInputRoutedToFeebacks[args.Number].FireUpdate();
+                    else
+                        Debug.Console(1, this, "No index of {0} found in UsbInputRoutedToFeedbacks");
+                    break;
+                }
+                case DMInputEventIds.HdcpCapabilityFeedbackEventId:
+                {
+                    Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
+                    if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                        InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                    else
+                        Debug.Console(1, this, "No index of {0} found in InputCardHdcpStateFeedbacks");
+                    break;
+                }
+                default:
+                {
+                    Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
+                    break;
                 }
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(2, this, Debug.ErrorLogLevel.Error, "Error in Chassis_DMInputChange: {0}", ex);
             }
         }
 

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

@@ -59,9 +59,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

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

@@ -63,9 +63,9 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.39.33033, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_Core, Version=0.0.0.22043, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

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

@@ -7,41 +7,27 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
-using Newtonsoft.Json;
-
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
     public class CiscoSparkCodecPropertiesConfig
     {
-        [JsonProperty("communicationMonitorProperties")]
         public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
 
-        [JsonProperty("favorites")]
         public List<CodecActiveCallItem> Favorites { get; set; }
 
         /// <summary>
         /// Valid values: "Local" or "Corporate"
         /// </summary>
-        [JsonProperty("phonebookMode")]
         public string PhonebookMode { get; set; }
 
-        [JsonProperty("showSelfViewByDefault")]
         public bool ShowSelfViewByDefault { get; set; }
 
-        [JsonProperty("sharing")]
         public SharingProperties Sharing { get; set; }
 
-        /// <summary>
-        /// Optionsal property to set the limit of any phonebook queries for directory or searching
-        /// </summary>
-        [JsonProperty("phonebookResultsLimit")]
-        public uint PhonebookResultsLimit { get; set; }
-
     }
 
     public class SharingProperties
     {
-        [JsonProperty("autoShareContentWhileInCall")]
         public bool AutoShareContentWhileInCall { get; set; }
     }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -14,6 +13,7 @@ using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
@@ -171,7 +171,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             // The thread responsible for dequeuing and processing the messages
             ReceiveThread = new Thread((o) => ProcessQueue(), null);
-            ReceiveThread.Priority = Thread.eThreadPriority.MediumPriority;
 
             Communication = comm;
 
@@ -402,9 +401,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
             // If the receive thread has for some reason stopped, this will restart it
             if (ReceiveThread.ThreadState != Thread.eThreadStates.ThreadRunning)
-            {
                 ReceiveThread.Start();
-            }
         }
 
 

essentials-framework/Essentials/PepperDashEssentials/packages.config

@@ -0,0 +1,3 @@
+<packages>
+  <package id="PepperDashCore" version="1.0.38-alpha-135" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+</packages>

packages.config

@@ -0,0 +1,3 @@
+<packages>
+  <package id="PepperDashCore" version="1.0.39" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+</packages>