Merge branch 'development' into feature/Descriptive-CEC-genericComm-failure-message

.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", "*.nuspec" | ForEach-Object {
+Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll" | ForEach-Object {
   $allowed = $true;
   # Exclude any files in submodules
   foreach ($exclude in $exclusions) {

.github/workflows/.vscode/settings.json

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

.github/workflows/docker.yml

@@ -32,20 +32,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      # And any submodules
+          submodules: true
-      #- 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
@@ -120,49 +107,6 @@ 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,19 +25,13 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
       # And any submodules
-      #- name: Checkout submodules
+      - name: Checkout submodules
-      #  shell: bash
+        shell: bash
-      #  run: |
+        run: |
-      #    git config --global url."https://github.com/".insteadOf "git@github.com:"
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
-      #    auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-      #    git submodule sync --recursive
+          git submodule sync --recursive
-      #    git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+          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
@@ -91,49 +85,6 @@ 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,7 +23,5 @@ 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 => GoWithLoadDeferred(), "go", "Loads configuration file",
+                CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Loads configuration file",
                     ConsoleAccessLevelEnum.AccessOperator);
             }
 
@@ -93,18 +93,13 @@ namespace PepperDash.Essentials
 
             if (!Debug.DoNotLoadOnNextBoot)
             {
-                GoWithLoad(null);
+                GoWithLoad();
                 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).
         /// 
@@ -177,7 +172,7 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Begins the process of loading resources including plugins and configuration data
         /// </summary>
-        public void GoWithLoad(object notUsed)
+        public void GoWithLoad()
         {
             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.39.33033, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+      <HintPath>..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Essentials_DM, Version=1.0.0.19343, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

README.md

@@ -1,37 +1,26 @@
+
 # 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 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).
+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.
-
-### 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:
@@ -45,13 +34,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.
 
-- 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).
-## 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/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs

@@ -165,29 +165,34 @@ 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();
 
-                if (Room.RoomOccupancy != null)
+                AddPostActivationAction(() =>
-                {
+                {
-                    if (Room.OccupancyStatusProviderIsRemote)
+                    CreateSymbolAndBasicSigs(IpId);
-                        SetUpRemoteOccupancy();
+                    SetUpSources();
-                    else
+                    SetUpCommunitcationMonitors();
-                    {
+                    SetUpDisplay();
-                        SetUpLocalOccupancy();
+                    SetUpError();
-                    }
+                    ExecuteCustomSteps();
-                }
+
+                    FusionRVI.GenerateFileForAllFusionDevices();
+
+                    GenerateGuidFile(guidFilePath);
+                });
 
-                // Make it so!   
-                FusionRVI.GenerateFileForAllFusionDevices();
-
-                GenerateGuidFile(guidFilePath);
             }
             catch (Exception e)
             {

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.39.33033, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\pepperdashcore-builds\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

@@ -1,24 +0,0 @@
-<?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 DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -329,56 +329,64 @@ namespace PepperDash.Essentials.DM
                     InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => { return Chassis.Inputs[tempX].EndpointOnlineFeedback; });
 
                     InputCardHdcpStateFeedbacks[tempX] = new IntFeedback(() => {
-                        var inputCard = Chassis.Inputs[tempX];
+                        try
-
-                        if (inputCard.Card is DmcHd)
                         {
-                            InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+                            var inputCard = Chassis.Inputs[tempX];
 
-                            if ((inputCard.Card as DmcHd).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                            if (inputCard.Card is DmcHd)
-                                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 DmcHd).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                                    return 1;
+                                return 0;
                             }
 
-                            if ((inputCard.Card as Dmc4kCBase).DmInput.HdcpSupportOnFeedback.BoolValue)
+                            if (inputCard.Card is DmcHdDsp)
-                                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)
+                                if ((inputCard.Card as DmcHdDsp).HdmiInput.HdcpSupportOnFeedback.BoolValue)
-                                return 1;
+                                    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;
                         }
-                        return 0;
+                        catch (InvalidOperationException iopex)
+                        {
+                            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);
+                            return 0;
+                        }   
                     });
                 }
             }
@@ -614,6 +622,13 @@ 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);
@@ -800,56 +815,63 @@ namespace PepperDash.Essentials.DM
 
         void Chassis_DMInputChange(Switch device, DMInputEventArgs args)
         {
-            switch (args.EventId)
+            try
             {
-                case DMInputEventIds.EndpointOnlineEventId:
+                switch (args.EventId)
                 {
-                    Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+                    case DMInputEventIds.EndpointOnlineEventId:
-                    InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+                        {
-                    break;
+                            Debug.Console(2, this, "DM Input EndpointOnlineEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                }
+                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                case DMInputEventIds.OnlineFeedbackEventId:
+                            break;
-                {
+                        }
-                    Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
+                    case DMInputEventIds.OnlineFeedbackEventId:
-                    InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
+                        {
-                    break;
+                            Debug.Console(2, this, "DM Input OnlineFeedbackEventId for input: {0}. State: {1}", args.Number, device.Inputs[args.Number].EndpointOnlineFeedback);
-                }
+                            InputEndpointOnlineFeedbacks[args.Number].FireUpdate();
-                case DMInputEventIds.VideoDetectedEventId:
+                            break;
-                {
+                        }
-                    Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
+                    case DMInputEventIds.VideoDetectedEventId:
-                    VideoInputSyncFeedbacks[args.Number].FireUpdate();
+                        {
-                    break;
+                            Debug.Console(2, this, "DM Input {0} VideoDetectedEventId", args.Number);
-                }
+                            VideoInputSyncFeedbacks[args.Number].FireUpdate();
-                case DMInputEventIds.InputNameEventId:
+                            break;
-                {
+                        }
-                    Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
+                    case DMInputEventIds.InputNameEventId:
-                    InputNameFeedbacks[args.Number].FireUpdate();
+                        {
-                    break;
+                            Debug.Console(2, this, "DM Input {0} NameFeedbackEventId", args.Number);
-                }
+                            InputNameFeedbacks[args.Number].FireUpdate();
-                case DMInputEventIds.UsbRoutedToEventId:
+                            break;
-                {
+                        }
-                    Debug.Console(2, this, "DM Input {0} UsbRoutedToEventId", args.Number);
+                    case DMInputEventIds.UsbRoutedToEventId:
-                    if (UsbInputRoutedToFeebacks[args.Number] != null)
+                        {
-                        UsbInputRoutedToFeebacks[args.Number].FireUpdate();
+                            Debug.Console(2, this, "DM Input {0} UsbRoutedToEventId", args.Number);
-                    else
+                            if (UsbInputRoutedToFeebacks[args.Number] != null)
-                        Debug.Console(1, this, "No index of {0} found in UsbInputRoutedToFeedbacks");
+                                UsbInputRoutedToFeebacks[args.Number].FireUpdate();
-                    break;
+                            else
-                }
+                                Debug.Console(1, this, "No index of {0} found in UsbInputRoutedToFeedbacks");
-                case DMInputEventIds.HdcpCapabilityFeedbackEventId:
+                            break;
-                {
+                        }
-                    Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
+                    case DMInputEventIds.HdcpCapabilityFeedbackEventId:
-                    if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                        {
-                        InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                            Debug.Console(2, this, "DM Input {0} HdcpCapabilityFeedbackEventId", args.Number);
-                    else
+                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
-                        Debug.Console(1, this, "No index of {0} found in InputCardHdcpStateFeedbacks");
+                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
-                    break;
+                            else
-                }
+                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
-                default:
+                            break;
-                {
+                        }
-                    Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
+                    default:
-                    break;
+                        {
+                            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.39.33033, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\pepperdashcore-builds\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.39.33033, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.26.30384, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\pepperdashcore-builds\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,27 +7,41 @@ 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,6 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.CrestronThread;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -13,7 +14,6 @@ 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,6 +171,7 @@ 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;
 
@@ -401,7 +402,9 @@ 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

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

packages.config

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